Tiny refactorings to clear some IDEA inspection warns.