More goto removal and searching a new found bug.