Merge "Remove useless goto."