Remove some gotos.

Two lines, please