Upstream chose more verbose fix via if() construct where indeterminate value takes false branch. Similar behavior to explict conversion.