Args and Waf upgrades.

Updating the version of waf. cleaning up the Args code slightly.