Fix things up to be like CS.