...so you don't have to look at all the output for any strangeness (also make rollback a little quieter)
...after getting rid of most of the hardcoding (though not all!)