This seems to change the contents of the tables in too many ways. So of it needs changing since PCI are somewhat broken by your recent patch.
So let's do this: please prepare a minimal patchset that just generates PCI description dynamically. Drop everything that's not necessary, and verify that make check produces trivial diffs only. We'll go from there. -- MST
