IntelliJ code inspection fixes.

Want to make sure we don't get false negatives when in the IDE.