Minor checkstyle supression file improvements