Minor merge script cosmetics.