Apologies, I think this broke "make check".  Here are the needed fixes.