Optimized some data structures.