I squashed your code-related changes on top of 0001, and the test-related changes into 0002. I also moved my test-related changes (Makefile / meson.build) from 0001 to 0002. I squashed the remaining fixes (the InvalidOid and the pgindent; 0005) into 0001 as well, so now we have:
I also added one more test to 0002 ("Width-sensitivity guard") and added the commit messages. Last but not least, I preserved your changes as co-author in 0001 and 0002.