[IR] More IntelliJ-based cleanup.