s/NoteGeneric/Note/ (long overdue)