Compile time improvements part 4.