Fix 1 missing and another extra pop in full-codegen