More improvements to build size.