[#961] Tweaks per @WouterJ and @jakzal