Now with works.

Due to a bug in my test (as shown by a coverage report), I wasn't
actually testing all the scenarios I thought I was testing.  The code
very stupidly didn't work at all.