We no longer need hard-coded list of scenarios.

Also reformat whitespace.