Checkstyle fixes.
Possible fix for #1017