Reorganized types.