Fix or simplify some IDS.