Fix option parsing to handle default affinity cmd correctly