More minor tweaks to arg parsing