Got rid of GenericOrderKey.