first attempt to remove arg identifiers:

failure.

But some progress was made, will have to revisit these regexes