Thanks, but I aborted the upgrade and restored from backups.
Going to put the two postgres versions up on different ports in parallel so I can tool with it as I have time.
Here is an improved script from Jeff (for posterity)
rename _ original_
proc _ {{key {}} {vars {}}} {
if {[string is space $key]} {
return NULL_KEY
}
return [uplevel [list original_ $key $vars]]
}
Round two, coming soon to a forum near you.