Both patches look good to me!
-- Tristan PartinPostgreSQL Contributors TeamAWS (https://aws.amazon.com)