HHH-8741 - More checkstyle cleanups