Fix refcounting and cut & paste error (?) in last checkin.

This should go onto release23-maint, too.