Remove a few more redundant itype checks.