Significant cleanup for argp transition