Hello, I have pushed these fixes, with some editorialization of my own.
I decided not to push the test case, because it has some nontrivial additions to the injection point infrastructure that I'm not so sure about. The part of the test that doesn't require those changes could perhaps be considered for 19, and we can discuss adding the rest in 20. Thanks! -- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/
