[#1786] Tweaks per @WouterJ on #2211