Use single consistent pattern to populate FlagSet

Fixed #126.