Tweaks to argument lists