Reorganize values to accommodate more uses.