Hi,
> Am I missing an existing cleanup path here?
There is a CF entry for this bug:
https://commitfest.postgresql.org/patch/6617/
--Regards,ChangAo Chen