Test for and fix new-style step assertions triggered by Buildbot code

This probably doesn't catch all of them, but exercises a good deal more code anyway.