Issue #93 More checkstyle error fixes.