Revert "Some low-hanging -Wunreachable-code fruits."

This reverts commit 8c2b19724d117cecfa186d044abdbf766372c679.

I don't understand - smoke-me came back happy with three
separate reports... oh well, some other time.