CLEANUP: Apply ist.cocci

This cleans up ist handling.
5 files changed