Tightening up the type system.