Add check-type and assert