Calm down build bots

r221975 seemed to trigger an ambiguous conversion that only irritated
clang, not gcc.