[CLEANUP] Small tweak to my previous cleanup commit. If I had run all the tests instead of a subset, I'd have seen my mistake. :)