Fixes a warning under clang in dead code. Ehsan's original patch converted to upstream-carrying style and applied by rillian.