Switch to new format for single-field tuples