Added catch-block storage class and primitive-type. Added :type nil for random and interior primitive types.