Argh, code that unit-tests can't test was broken.