make the option parsing work as expected. Patch submitted by Geoff Wing in PR pkg/25553, which this closes.