Minor adjustments to object type checks.