Merge "Fix codegen_test after DCE fix."