[IR] IntelliJ test run: IntelliJ suggested cleanup and fixes.