Fixup flag parser prep for phases - actually add option groups.

https://rbcommons.com/s/twitter/r/877/