I wrote this one while chasing down some bugs in the closing days of 8.4.  It
could be useful in the long run.  This area of the code had no test coverage
at all before.