Simplify data structure somewhat.