Split out the additional oftype issues.