MNT: Adding type-checking again