Removes few unreacheable warnings. This is somehow related to the
ticket #2645.

cmr=v1.8.2:reviewer=jsquyres