Improved datatype enforcement.