EST-228: further checkstyle fixes.