Obviously had to expand the args to support munging them a bit on the way in.