Sorry, here's the patch. Power loss distracted me here.
By the way, the pgindent you did is slightly confused because you failedto add the new struct types you define to typedefs.list.
I have not looked at the new xml.c code at all, yet.
-- Álvaro Herrera https://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services