`if...else` above can be replaced with `IntegrationNamespaceUtils.createExpressionDefinitionFromValueOrExpression`. And let me guess: your new util `ensureMutualExclusivity` method as well :smile: