After changing all the unit tests, I actually prefer this version because it's more symmetric.