Fix some notes not being ignored when using an error code (#7573)
Either change the error code to match the related error, so that
both will always be ignored at the same time, or switch a note to
an error (in case the relevant error code is hard to predict).
Fixes #7562.
