Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
+++ benchmark/Makefile.am	(revision 1d72a114ba5299f58ce9efac3223c109bf97b89e)
@@ -30,4 +30,5 @@
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
+BENCH_V_PY = $(__bench_v_PY_$(__quiet))
 BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
 BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
@@ -47,5 +48,6 @@
 __bench_v_UPP_verbose = $(AM_V_UPP)
 __bench_v_GOC_verbose = $(AM_V_GOC)
-__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
+__bench_v_PY_verbose = $(AM_V_PY)
+__bench_v_RUSTC_verbose = $(AM_V_RUST)
 __bench_v_NODEJS_verbose = $(AM_V_NODEJS)
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
@@ -179,12 +181,4 @@
 	$(srcdir)/fixcsv.sh $@
 
-# basic.csv:
-# 	echo "$@"
-# 	echo "generator,coroutine,thread" > $@
-# 	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
-# 	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
-# 	+make basic-cfa_thread.runquiet >> $@
-# 	$(srcdir)/fixcsv.sh $@
-
 ctxswitch.csv:
 	echo "building $@"
@@ -292,15 +286,15 @@
 
 ctxswitch-python_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
 	echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_await$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
 	chmod a+x a.out
@@ -455,10 +449,10 @@
 
 creation-python_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
 	echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
 	chmod a+x a.out
 
 creation-nodejs_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
 	chmod a+x a.out
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 4aac9ffe1aa65f199a4072676c0db437b8fa5539)
+++ benchmark/Makefile.in	(revision 1d72a114ba5299f58ce9efac3223c109bf97b89e)
@@ -368,11 +368,15 @@
 am__v_GOC_0 = @echo "  GOC     " $@;
 am__v_GOC_1 = 
+AM_V_PY = $(am__v_PY_@AM_V@)
+am__v_PY_ = $(am__v_PY_@AM_DEFAULT_V@)
+am__v_PY_0 = @echo "  PYTHON  " $@;
+am__v_PY_1 = 
 AM_V_RUST = $(am__v_RUST_@AM_V@)
 am__v_RUST_ = $(am__v_RUST_@AM_DEFAULT_V@)
-am__v_RUST_0 = @echo "  RUST     " $@;
+am__v_RUST_0 = @echo "  RUST    " $@;
 am__v_RUST_1 = 
 AM_V_NODEJS = $(am__v_NODEJS_@AM_V@)
 am__v_NODEJS_ = $(am__v_NODEJS_@AM_DEFAULT_V@)
-am__v_NODEJS_0 = @echo "  NODEJS     " $@;
+am__v_NODEJS_0 = @echo "  NODEJS  " $@;
 am__v_NODEJS_1 = 
 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
@@ -390,4 +394,5 @@
 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
+BENCH_V_PY = $(__bench_v_PY_$(__quiet))
 BENCH_V_RUSTC = $(__bench_v_RUSTC_$(__quiet))
 BENCH_V_NODEJS = $(__bench_v_NODEJS_$(__quiet))
@@ -406,5 +411,6 @@
 __bench_v_UPP_verbose = $(AM_V_UPP)
 __bench_v_GOC_verbose = $(AM_V_GOC)
-__bench_v_RUSTC_verbose = $(AM_V_RUSTC)
+__bench_v_PY_verbose = $(AM_V_PY)
+__bench_v_RUSTC_verbose = $(AM_V_RUST)
 __bench_v_NODEJS_verbose = $(AM_V_NODEJS)
 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
@@ -854,12 +860,4 @@
 	$(srcdir)/fixcsv.sh $@
 
-# basic.csv:
-# 	echo "$@"
-# 	echo "generator,coroutine,thread" > $@
-# 	+make basic-cfa_generator.runquiet >> $@ && echo -n ',' >> $@
-# 	+make basic-cfa_coroutine.runquiet >> $@ && echo -n ',' >> $@
-# 	+make basic-cfa_thread.runquiet >> $@
-# 	$(srcdir)/fixcsv.sh $@
-
 ctxswitch.csv:
 	echo "building $@"
@@ -934,15 +932,15 @@
 
 ctxswitch-python_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
 	echo "python3.7 $(srcdir)/ctxswitch/python_cor.py" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/ctxswitch/node_cor.js" >> a.out
 	chmod a+x a.out
 
 ctxswitch-nodejs_await$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/ctxswitch/node_await.js" >> a.out
 	chmod a+x a.out
@@ -1088,10 +1086,10 @@
 
 creation-python_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_PY)echo "#!/bin/sh" > a.out
 	echo "python3.7 $(srcdir)/creation/python_cor.py" >> a.out
 	chmod a+x a.out
 
 creation-nodejs_coroutine$(EXEEXT):
-	echo "#!/bin/sh" > a.out
+	$(BENCH_V_NODEJS)echo "#!/bin/sh" > a.out
 	echo "nodejs $(srcdir)/creation/node_cor.js" >> a.out
 	chmod a+x a.out