I forgot to change the test suite accordingly.  Here's an updated patch.