Merge "pickmode: Fix a pair of unsigned overflows."