Merge r262770 from head: pacify gcc.