Fix discrepancies between devo and egcs.