Tightening type checking