Seems I misremembered the whole opfuncid getting reset thing (it applies to reading a node from string, not copying) and it was undone by 9f1255ac8593 anyway. I don't think it makes much of a difference, but I mention this in case you're wondering why I changed the fix_opfuncids() call.
-- Álvaro Herrera https://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services