Minor update to argument parser (added choices for a few cases).