Avoid ELSE GOTO and ELSE RETURN.

Avoid ELSE GOTO and ELSE RETURN.