Removed own goto kind and used jump_list