Adding unwrapping of tuples or procedures check to ObjectType.