Tidy up condition codes