[#2150] Tweaks per comments from @fabpot and @WouterJ