I forgot to add: Many thanks, Bruce, for working on this patch.
-- Álvaro Herrera http://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Training & Services