Moved some of the clauses into the scenario.  This is as much to
test the system as for any good reason, but it's not unreasonable.