Cleaner type restrictions-- beginnings of better validation.