Improved compile time: