Compile time improvements part 6.