Clean up Args+Mode coupling

The Args => Mode mapping was causing a memory leak. Not good.