Parameterize agent type in parser, remove dependence on THIS_AGENT_TYPE
Remove args.h