Data structure change to improve compile time (especially in debug mode).