Added in more files from  'colons-in-args' that were missed in last push.