Actually, make note_index refs untyped