#14: fix environment provenance
#16: Fix argument overlap bug