I went ahead and pushed the stopgap patches, along with regression tests
based on yours. The tests show the current (i.e. wrong) behavior for
index comment and relfilenode reuse. I think that whenever we fix that,
we can just adjust the expected output instead of adding more tests.
regards, tom lane