Tweaks based on feedback from Andres Freund