Upgraded check-types.