First steps on cleaning up the 'args' mess.