Remove more of 'else's after 'returns'. No functional change.