Much more checkstyle code cleanup.