Now all tests are passing, but haven't yet evaluated how it effects
performance of cactus.