Comment 10 for bug 1571714

Here's an alternate fix that just filters unused keys out of args instead of removing it completely. It also leaves msg alone since that isn't a security concern. This one should be less disruptive while still addressing the behavior that led to this bug.