maybe discard_temp_oid instead of old_temp_oid?
(Same for the OpContext too)