Formatting in generated code, bugfixes where ArgumentWatcherGatherer and ImportIterator didn't iterate over args