Cleaned up help on options

Especially, I removed the option groups. I used them initially because I
thought they'd improve readability. They don't. Their main benefit seems
to be confusion -- for me regarding where to put options, for users
regarding "where is the help for option x"..