More goto elimination in misc.c