Optimized compile times and reduced binary size. Hopefully, this will resolve linking timeouts in the tests.