Optimization - this breaks tests, but I believe for invalid reasons. [WIP].