Unbreak cmdline_test.

There was a k-vs-j loop error introduced by a prior comment.
Stop options with implicit value from consuming separate tokens.

The current documentation states that if an option has implicit
value, it will only consume adjacent token.