On further discussion: yes, this will re-write all the notices.  That's going to be a massive noise changeset.  Feeling was to pursue that on a separate pull request for clean-ness, perhaps including in that changeset the travis-ci configuration that would detect notice irregularities from then on.