More CheckStyle fixes.