minor cleanup in count_rice_bits_()