Remove some more gotos

Change-Id: I9c4b3a5aecf4011653933b051e67605a6feb123f
1 file changed