Tweaks to previous PR.