macro-up the storage-type switchers
extend use of storage_t enum