A little more reordering of the option data.