Fixup assertions to be more generic...

So they'll also work for generic web services