Less errors, more checking