Switched from boxed structures to unboxed everywhere