Even more compile time improvements