Fix up plotting for the new data format.