Misc cleanup, consolidation of TupleStorageDescription special casing