Rearrange arg parsing a bit.