Previously, strategies were specified with structures with function
pointers.  Overly cleaver definitions made them look like macro
definitions.  This all caused weird complications with calling things.
Made things more explicit by making the strategy identifiers enumerated
numbers and using switch statements to call them.