A little bit of cleanup in the Blatter code.