Fix a few more "unreachable code" warnings
5 files changed