Shrink more. Fix capacity bug. Reduce includes, which reduces compile time.