Issue #5510: fixes two minor review comments
Issue #5510: fixes two minor review comments

checkstyle/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,romani/checkstyle,romani/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,rnveach/checkstyle,romani/checkstyle,rnveach/checkstyle,romani/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,checkstyle/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,romani/checkstyle,romani/checkstyle