Fixed more goto event lines.