Addressing Checkstyle warnings introduced in 8ff60020 and ffe2b4da