Improved argument parser for options that have limited choices (runit, fit).