Tidy up and a bit of renaming; gets rid of those end-of-file exceptions.
Right! Generate-assertion now takes varargs and would generate assertions
for varargs, I'm just not yet passing the right number or arguments to it.
That's the next step, and shouldn't be hard.