... and with a few more changes and tweaks, all the tests pass in the
self-contained-pg branch!
Next steps:
* Merge that back into devel. I'm going to do that right now.
* Hopefully people will give it a try and see if everything works for them.
* Merge into master and release.