Getting rid of some unreachables.

Since Travis upgrade is imminent and much of my code is breaking anyway,
I might as well upgrade for 1.1.