Comment 20 for bug 1838995

Andrea helpfully pointed out a couple things that got lost in a rebase earlier, and one remaining instance of "subscription" that needed to become "hold group". I've pushed two commits the the above-linked branch to address those.