More Type Safety

Reduces total warnings to 75.