This makes it more clear what the relationship is between the Builder and the resulting Flags.
This fixes the next part of #287.