If you are trying ensure that everything is stored, I'd rather see us delete the non-stored field suffixes from the schema.