This fixes a countless broken Notes references found by !7454 (closed) and generally improves consistency.