More reductions to binary size.