Remove spurioius return in one out of four if-else clauses.

We do return right after the if-else.  This return (with its confusing
comments) comes from before 6b7c3b42 but doesn't make sense now.