Good catch. I'll deal with this after it passes the test suite, maybe refactor things a bit.