Final fix for checkstyle.