Changes to data structures for speedups.