remove more alloca()'s