Use single consistent pattern to populate FlagSet

Fixed #126.
Merge pull request #128 from pietern/flagset

Use single consistent pattern to populate FlagSet