Annotations for NFC

Refs #838