More goto elimination.