These were open-coded before. Pull them into the struct
initializer for somewhat clearer code.

I'm doing this now as I'm about to add another option.

Change-Id: Ie04cfc9fb1f4128b8faf5c85757d7263aa77e5a0