Eliminated an unnecessary goto.