Previously due to a silly implementation bug CNFs would never have their
dirty flag set, resulting in their being added again and again to the
`mut_list`. Fix this.

Fixes #17297.

(cherry picked from commit ba27fe74)