Finish PR 4842

knw was removed as a variable, but it's still actually used.

I also fixed a test that depended on the old notification messages.