Rearrange the test case generators to be exactly in the same order
that they are called, so as to make future editing easier.  And
generally tidy up.  No functional change.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14681 a5019735-40e9-0310-863c-91ae7b9d1cf9