Fix a clang warning.

-Wmismatched-tags warns about forward-declaring a class as a struct
or vice versa.
Simplify the random_choose template (PleasingFungus)

Rather than expanding recursively, just make an array of the parameters
and roll a single random number.  Use reference_wrapper to avoid making
copies, but probably that is overkill for the simple value types we
currently use.