diff --git a/java/ql/test/utils/model-generator/CaptureSinkModels.expected b/java/ql/test/utils/model-generator/CaptureSinkModels.expected
index 8f2f422da53..79483bc24b1 100644
--- a/java/ql/test/utils/model-generator/CaptureSinkModels.expected
+++ b/java/ql/test/utils/model-generator/CaptureSinkModels.expected
@@ -1,4 +1,4 @@
-| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[-1];generated:create-file |
-| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];generated:create-file |
-| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];generated:open-url |
-| p;Sources;true;readUrl;(URL);;Argument[0];generated:open-url |
+| p;PrivateFlowViaPublicInterface$SPI;true;openStream;();;Argument[-1];create-file;generated |
+| p;Sinks;true;copyFileToDirectory;(Path,Path,CopyOption[]);;Argument[1];create-file;generated |
+| p;Sinks;true;readUrl;(URL,Charset);;Argument[0];open-url;generated |
+| p;Sources;true;readUrl;(URL);;Argument[0];open-url;generated |
diff --git a/java/ql/test/utils/model-generator/CaptureSourceModels.expected b/java/ql/test/utils/model-generator/CaptureSourceModels.expected
index 27c28a28115..97b58499177 100644
--- a/java/ql/test/utils/model-generator/CaptureSourceModels.expected
+++ b/java/ql/test/utils/model-generator/CaptureSourceModels.expected
@@ -1,5 +1,5 @@
-| p;Sources;true;readUrl;(URL);;ReturnValue;generated:remote |
-| p;Sources;true;socketStream;();;ReturnValue;generated:remote |
-| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;generated:remote |
-| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;generated:remote |
-| p;Sources;true;wrappedSocketStream;();;ReturnValue;generated:remote |
+| p;Sources;true;readUrl;(URL);;ReturnValue;remote;generated |
+| p;Sources;true;socketStream;();;ReturnValue;remote;generated |
+| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[0].ArrayElement;remote;generated |
+| p;Sources;true;sourceToParameter;(InputStream[],List);;Argument[1].Element;remote;generated |
+| p;Sources;true;wrappedSocketStream;();;ReturnValue;remote;generated |
diff --git a/java/ql/test/utils/model-generator/CaptureSummaryModels.expected b/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
index 96c0a7e9df7..46290dc0637 100644
--- a/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
+++ b/java/ql/test/utils/model-generator/CaptureSummaryModels.expected
@@ -1,46 +1,46 @@
-| p;Factory;false;create;(String);;Argument[0];ReturnValue;generated:taint |
-| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;generated:taint |
-| p;Factory;false;getValue;();;Argument[-1];ReturnValue;generated:taint |
-| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;generated:taint |
-| p;FluentAPI;false;returnsThis;(String);;Argument[-1];ReturnValue;generated:value |
-| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[-1];generated:taint |
-| p;ImmutablePojo;false;getValue;();;Argument[-1];ReturnValue;generated:taint |
-| p;ImmutablePojo;false;or;(String);;Argument[-1];ReturnValue;generated:taint |
-| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;generated:taint |
-| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;generated:taint |
-| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;generated:taint |
-| p;InnerHolder;false;append;(String);;Argument[0];Argument[-1];generated:taint |
-| p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[-1];generated:taint |
-| p;InnerHolder;false;getValue;();;Argument[-1];ReturnValue;generated:taint |
-| p;InnerHolder;false;setContext;(String);;Argument[0];Argument[-1];generated:taint |
-| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[-1];generated:taint |
-| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[-1];generated:taint |
-| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[-1];generated:taint |
-| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[-1];generated:taint |
-| p;Joiner;false;add;(CharSequence);;Argument[-1];ReturnValue;generated:value |
-| p;Joiner;false;merge;(Joiner);;Argument[-1];ReturnValue;generated:value |
-| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[-1];ReturnValue;generated:value |
-| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[-1];generated:taint |
-| p;Joiner;false;toString;();;Argument[-1];ReturnValue;generated:taint |
-| p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;generated:taint |
-| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];generated:taint |
-| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;generated:taint |
-| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;generated:taint |
-| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;generated:taint |
-| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;generated:taint |
-| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;generated:taint |
-| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;generated:taint |
-| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;generated:taint |
-| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;generated:taint |
-| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;generated:taint |
-| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;generated:taint |
-| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];generated:taint |
-| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];generated:taint |
-| p;Pojo;false;fillIn;(List);;Argument[-1];Argument[0].Element;generated:taint |
-| p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;generated:taint |
-| p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;generated:taint |
-| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;generated:taint |
-| p;Pojo;false;getCharArray;();;Argument[-1];ReturnValue;generated:taint |
-| p;Pojo;false;getValue;();;Argument[-1];ReturnValue;generated:taint |
-| p;Pojo;false;setValue;(String);;Argument[0];Argument[-1];generated:taint |
-| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;generated:taint |
+| p;Factory;false;create;(String);;Argument[0];ReturnValue;taint;generated |
+| p;Factory;false;create;(String,int);;Argument[0];ReturnValue;taint;generated |
+| p;Factory;false;getValue;();;Argument[-1];ReturnValue;taint;generated |
+| p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;generated |
+| p;FluentAPI;false;returnsThis;(String);;Argument[-1];ReturnValue;value;generated |
+| p;ImmutablePojo;false;ImmutablePojo;(String,int);;Argument[0];Argument[-1];taint;generated |
+| p;ImmutablePojo;false;getValue;();;Argument[-1];ReturnValue;taint;generated |
+| p;ImmutablePojo;false;or;(String);;Argument[-1];ReturnValue;taint;generated |
+| p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;generated |
+| p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;generated |
+| p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;generated |
+| p;InnerHolder;false;append;(String);;Argument[0];Argument[-1];taint;generated |
+| p;InnerHolder;false;explicitSetContext;(String);;Argument[0];Argument[-1];taint;generated |
+| p;InnerHolder;false;getValue;();;Argument[-1];ReturnValue;taint;generated |
+| p;InnerHolder;false;setContext;(String);;Argument[0];Argument[-1];taint;generated |
+| p;Joiner;false;Joiner;(CharSequence);;Argument[0];Argument[-1];taint;generated |
+| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[0];Argument[-1];taint;generated |
+| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[1];Argument[-1];taint;generated |
+| p;Joiner;false;Joiner;(CharSequence,CharSequence,CharSequence);;Argument[2];Argument[-1];taint;generated |
+| p;Joiner;false;add;(CharSequence);;Argument[-1];ReturnValue;value;generated |
+| p;Joiner;false;merge;(Joiner);;Argument[-1];ReturnValue;value;generated |
+| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[-1];ReturnValue;value;generated |
+| p;Joiner;false;setEmptyValue;(CharSequence);;Argument[0];Argument[-1];taint;generated |
+| p;Joiner;false;toString;();;Argument[-1];ReturnValue;taint;generated |
+| p;MultipleImpls$Strat2;true;getValue;();;Argument[-1];ReturnValue;taint;generated |
+| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];Argument[-1];taint;generated |
+| p;MultipleImpls$Strategy;true;doSomething;(String);;Argument[0];ReturnValue;taint;generated |
+| p;ParamFlow;true;addTo;(String,List);;Argument[0];Argument[1].Element;taint;generated |
+| p;ParamFlow;true;returnArrayElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;generated |
+| p;ParamFlow;true;returnCollectionElement;(List);;Argument[0].Element;ReturnValue;taint;generated |
+| p;ParamFlow;true;returnIterableElement;(Iterable);;Argument[0].Element;ReturnValue;taint;generated |
+| p;ParamFlow;true;returnIteratorElement;(Iterator);;Argument[0].Element;ReturnValue;taint;generated |
+| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[0];ReturnValue;taint;generated |
+| p;ParamFlow;true;returnMultipleParameters;(String,String);;Argument[1];ReturnValue;taint;generated |
+| p;ParamFlow;true;returnVarArgElement;(String[]);;Argument[0].ArrayElement;ReturnValue;taint;generated |
+| p;ParamFlow;true;returnsInput;(String);;Argument[0];ReturnValue;taint;generated |
+| p;ParamFlow;true;writeChunked;(byte[],OutputStream);;Argument[0];Argument[1];taint;generated |
+| p;ParamFlow;true;writeChunked;(char[],OutputStream);;Argument[0];Argument[1];taint;generated |
+| p;Pojo;false;fillIn;(List);;Argument[-1];Argument[0].Element;taint;generated |
+| p;Pojo;false;getBoxedBytes;();;Argument[-1];ReturnValue;taint;generated |
+| p;Pojo;false;getBoxedChars;();;Argument[-1];ReturnValue;taint;generated |
+| p;Pojo;false;getByteArray;();;Argument[-1];ReturnValue;taint;generated |
+| p;Pojo;false;getCharArray;();;Argument[-1];ReturnValue;taint;generated |
+| p;Pojo;false;getValue;();;Argument[-1];ReturnValue;taint;generated |
+| p;Pojo;false;setValue;(String);;Argument[0];Argument[-1];taint;generated |
+| p;PrivateFlowViaPublicInterface;true;createAnSPI;(File);;Argument[0];ReturnValue;taint;generated |