Fix up some {ignore} and {notrust}s

These should be properly annotated instead.

Fixes #16219.