Clean up Indicator-vs-Incident idiom.