From: Erik Sandberg <mandolaerik@gmail.com>
Date: Sun, 15 Oct 2006 11:30:04 +0000 (+0000)
Subject: 	* lily/*.cc, lily/include/*.hh: eliminate dummy arguments from
X-Git-Tag: release/2.10.0-2~166
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=358d6e99ada8019268ade9ba9080b2d0d88eeb7a;p=lilypond.git

	* lily/*.cc, lily/include/*.hh: eliminate dummy arguments from
	macros ADD_TRANSLATOR, DECLARE_SMOBS and DECLARE_SIMPLE_SMOBS
---

diff --git a/ChangeLog b/ChangeLog
index f7a5f3b43e..2928a2aa46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-15  Erik Sandberg  <mandolaerik@gmail.com>
+
+	* lily/*.cc, lily/include/*.hh: eliminate dummy arguments from
+	macros ADD_TRANSLATOR, DECLARE_SMOBS and DECLARE_SIMPLE_SMOBS
+	
 2006-10-15  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* mf/GNUmakefile: remove fc-cache calls; not necessary for fc 2.4; 
@@ -95,6 +100,10 @@
 	* scm/document-music.cc: use data from translator listener
 	registration to generate documentation for event classes
 
+	* lily/*: Eliminate accept arg of ADD_TRANSLATOR
+	
+	* lily/include/*: Eliminate dummy arg of DECLARE_*SMOBS
+	
 2006-10-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* GNUmakefile.in (SCRIPTS): Remove lexer-gcc-3.1.sh.
diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index 3bd03fb697..fc462faffa 100644
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -599,8 +599,6 @@ ADD_TRANSLATOR (Accidental_engraver,
 		"so you can @code{\\override} them at @code{Voice}. ",
 		"Accidental AccidentalSuggestion",
 
-		"",
-
 		"autoAccidentals "
 		"autoCautionaries "
 		"internalBarNumber "
diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc
index 6590b0a1cb..2c606e878a 100644
--- a/lily/ambitus-engraver.cc
+++ b/lily/ambitus-engraver.cc
@@ -189,7 +189,5 @@ ADD_TRANSLATOR (Ambitus_engraver,
 		"AmbitusLine "
 		"AmbitusNoteHead "
 		"AmbitusAccidental",
-
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 633d924e5a..a09810d90a 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -102,6 +102,5 @@ ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column);
 ADD_TRANSLATOR (Arpeggio_engraver,
 		/* doc */ "Generate an Arpeggio symbol",
 		/* create */ "Arpeggio",
-		/* accept */ "arpeggio-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 0472c4cdec..48766e7e52 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -427,6 +427,5 @@ ADD_TRANSLATOR (Auto_beam_engraver,
 		"@ref{Stem_engraver} properties @code{stemLeftBeamCount} and "
 		"@code{stemRightBeamCount}. ",
 		/* create */ "Beam",
-		/* accept */ "beam-forbid-event",
 		/* read */ "autoBeaming autoBeamSettings beatLength subdivideBeams",
 		/* write */ "");
diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 7efe7b4874..d80bbde853 100644
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -103,7 +103,6 @@ ADD_ACKNOWLEDGER (Axis_group_engraver, grob);
 ADD_TRANSLATOR (Axis_group_engraver,
 		/* doc */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
 		/* create */ "VerticalAxisGroup",
-		/* accept */ "",
 		/* read */
 		"currentCommandColumn ",
 
diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 16792eac58..ce456c8963 100644
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -99,6 +99,5 @@ ADD_TRANSLATOR (Bar_engraver,
 		/* doc */ "Create barlines. This engraver is controlled through the "
 		"@code{whichBar} property. If it has no bar line to create, it will forbid a linebreak at this point",
 		/* create */ "BarLine",
-		/* accept */ "",
 		/* read */ "whichBar",
 		/* write */ "forbidBreak");
diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index 1758a91c57..e9891d216a 100644
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -130,7 +130,6 @@ ADD_TRANSLATOR (Bar_number_engraver,
 		"@code{@ref{Staff_collecting_engraver}}. ",
 
 		/* create */ "BarNumber",
-		/* accept */ "",
 		/* read */
 		"currentBarNumber "
 		"whichBar "
diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 46d932e2f7..4501519136 100644
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -269,7 +269,6 @@ ADD_TRANSLATOR (Beam_engraver,
 		"printed with flags instead of beams.",
 		
 		/* create */ "Beam",
-		/* accept */ "beam-event",
 
 		/* read */
 		"beamMelismaBusy "
@@ -337,7 +336,6 @@ ADD_TRANSLATOR (Grace_beam_engraver,
 		" are at grace points in time. ",
 		
 		/* create */ "Beam",
-		/* accept */ "beam-event",
 		/* read */
 		"beamMelismaBusy "
 		"beatLength "
diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index ba0135f1d0..9ef23055fb 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -81,6 +81,5 @@ Beam_performer::listen_beam (Stream_event *ev)
     now_stop_ev_ = ev;
 }
 
-ADD_TRANSLATOR (Beam_performer, "", "",
-		"beam-event", "", "");
+ADD_TRANSLATOR (Beam_performer, "", "", "", "");
 
diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 461ead59ca..7a61987846 100644
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -121,6 +121,5 @@ ADD_TRANSLATOR (Break_align_engraver,
 		"groups, and order the groups according to @code{breakAlignOrder}. "
 		"The left edge of the alignment gets a separate group, with a symbol @code{left-edge}. ",
 		/* create */ "BreakAlignment BreakAlignGroup LeftEdge",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/breathing-sign-engraver.cc b/lily/breathing-sign-engraver.cc
index 126110e07e..f24d85541f 100644
--- a/lily/breathing-sign-engraver.cc
+++ b/lily/breathing-sign-engraver.cc
@@ -66,6 +66,5 @@ Breathing_sign_engraver::stop_translation_timestep ()
 ADD_TRANSLATOR (Breathing_sign_engraver,
 		/* doc */ "",
 		/* create */ "BreathingSign",
-		/* accept */ "breathing-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 20752ae2f7..67a9bf1d90 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -141,7 +141,6 @@ ADD_TRANSLATOR (Chord_name_engraver,
 		/* doc */ "Catch note-events "
 		"and generate the appropriate chordname.",
 		/* create */ "ChordName",
-		/* accept */ "note-event",
 		/* read */ "chordChanges chordNameExceptions chordNameFunction "
 		"chordNoteNamer chordRootNamer chordNameExceptions majorSevenSymbol",
 		/* write */ "");
diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc
index f07e984626..bd380facc7 100644
--- a/lily/chord-tremolo-engraver.cc
+++ b/lily/chord-tremolo-engraver.cc
@@ -144,6 +144,5 @@ ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem);
 ADD_TRANSLATOR (Chord_tremolo_engraver,
 		/* doc */ "Generates beams for tremolo repeats.",
 		/* create */ "Beam",
-		/* accept */ "tremolo-span-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index 4bf248770f..78472dc99e 100644
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -195,7 +195,6 @@ ADD_TRANSLATOR (Clef_engraver,
 		/* doc */ "Determine and set reference point for pitches",
 		/* create */ "Clef "
 		"OctavateEight ",
-		/* accept */ "",
 		/* read */
 		"clefGlyph "
 		"clefOctavation "
diff --git a/lily/cluster-engraver.cc b/lily/cluster-engraver.cc
index 33ee746e6b..cd0c59b817 100644
--- a/lily/cluster-engraver.cc
+++ b/lily/cluster-engraver.cc
@@ -123,7 +123,6 @@ ADD_ACKNOWLEDGER (Cluster_spanner_engraver, note_column);
 ADD_TRANSLATOR (Cluster_spanner_engraver,
 		/* doc */ 	"Engraves a cluster using Spanner notation ",
 		/* create */ 	"ClusterSpanner ClusterSpannerBeacon",
-		/* accept */ 	"cluster-note-event",
 		/* read */ 	"",
 		/* write */	"");
 
diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc
index 404c1a5c71..7f56435e81 100644
--- a/lily/collision-engraver.cc
+++ b/lily/collision-engraver.cc
@@ -68,6 +68,5 @@ ADD_ACKNOWLEDGER (Collision_engraver, note_column);
 ADD_TRANSLATOR (Collision_engraver,
 		/* doc */ "Collect NoteColumns, and as soon as there are two or more, put them in a NoteCollision object.",
 		/* create */ "NoteCollision",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 9a72b6d5ed..cfe57862d4 100644
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -295,8 +295,6 @@ ADD_TRANSLATOR (Completion_heads_engraver,
 		"NoteHead "
 		"Dots "
 		"Tie",
-
-		/* accept */ "note-event",
 		/* read */
 		"middleCPosition "
 		"measurePosition "
diff --git a/lily/control-track-performer.cc b/lily/control-track-performer.cc
index ec4ef83cdd..3583d48c5e 100644
--- a/lily/control-track-performer.cc
+++ b/lily/control-track-performer.cc
@@ -66,5 +66,4 @@ Control_track_performer::initialize ()
 }
 
 ADD_TRANSLATOR (Control_track_performer, "", "",
-		"",
 		"", "");
diff --git a/lily/custos-engraver.cc b/lily/custos-engraver.cc
index 82381b764c..847c552566 100644
--- a/lily/custos-engraver.cc
+++ b/lily/custos-engraver.cc
@@ -139,6 +139,5 @@ ADD_ACKNOWLEDGER (Custos_engraver, note_head);
 ADD_TRANSLATOR (Custos_engraver,
 		/* doc */ "",
 		/* create */ "Custos",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/default-bar-line-engraver.cc b/lily/default-bar-line-engraver.cc
index 8d78a2c948..4e65fe6c83 100644
--- a/lily/default-bar-line-engraver.cc
+++ b/lily/default-bar-line-engraver.cc
@@ -35,7 +35,6 @@ ADD_TRANSLATOR (Default_bar_line_engraver,
 		"level as @ref{Timing_translator}. ",
 		
 		/* create */ "",
-		/* accept */ "",
 
 		/* read */
 		"automaticBars "
diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc
index a2b1cdf3a5..04a75241c6 100644
--- a/lily/dot-column-engraver.cc
+++ b/lily/dot-column-engraver.cc
@@ -57,6 +57,5 @@ ADD_TRANSLATOR (Dot_column_engraver,
 		/* doc */ "Engraves dots on dotted notes shifted to the right of the note.\n"
 		"If omitted, then dots appear on top of the notes.",
 		/* create */ "DotColumn",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/dots-engraver.cc b/lily/dots-engraver.cc
index cb39fc0a80..7850b907e7 100644
--- a/lily/dots-engraver.cc
+++ b/lily/dots-engraver.cc
@@ -58,9 +58,6 @@ ADD_TRANSLATOR(Dots_engraver,
 	       /* create */
 	       "Dots ",
 
-	       /*acc*/
-	       "",
-
 	       /*r*/
 	       "" ,
 	       
diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index c9dd52b8e6..5cdbbe8a4c 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -136,8 +136,6 @@ ADD_TRANSLATOR (Drum_notes_engraver,
 		/* create */
 		"NoteHead "
 		"Script",
-
-		/* accept */ "note-event",
 		/* read */ "drumStyleTable",
 		/* write */ "");
 
diff --git a/lily/drum-note-performer.cc b/lily/drum-note-performer.cc
index a4e0ff2f7f..19ba7bbf90 100644
--- a/lily/drum-note-performer.cc
+++ b/lily/drum-note-performer.cc
@@ -91,5 +91,4 @@ Drum_note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Drum_note_performer,
-		"Play drum notes.", "",
-		"note-event", "", "");
+		"Play drum notes.", "", "", "");
diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index daba771386..a0e99ad047 100644
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -485,6 +485,5 @@ ADD_TRANSLATOR (Dynamic_engraver,
 		"which takes care of vertical positioning.  ",
 
 		/* create */ "DynamicLineSpanner DynamicText Hairpin TextSpanner",
-		/* accept */ "absolute-dynamic-event crescendo-event decrescendo-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 4ee655db47..0dd4556060 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -120,9 +120,6 @@ Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
 ADD_TRANSLATOR (Dynamic_performer,
 		/* doc */ 		 "",
 		/* create */ "",
-		
-		/* accept */
-		"absolute-dynamic-event",
 
 		/* read */
 		"dynamicAbsoluteVolumeFunction "
diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index 6271d93979..525c1fa857 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -181,7 +181,6 @@ Engraver_group::Engraver_group ()
 ADD_TRANSLATOR_GROUP (Engraver_group,
 		      /* doc */ "A group of engravers taken together",
 		      /* create */ "",
-		      /* accept */ "",
 		      /* read */ "",
 		      /* write */ "");
 
diff --git a/lily/engraver.cc b/lily/engraver.cc
index ef13351c2e..5f74a8b5c5 100644
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -169,6 +169,5 @@ ADD_TRANSLATOR (Engraver,
 		"Base class for engravers. Does nothing, so it is not used.",
 		"",
 		"",
-		"",
 		"");
 
diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 53938b24f6..3fb0d43033 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -145,6 +145,5 @@ ADD_ACKNOWLEDGER (Extender_engraver, lyric_syllable);
 ADD_TRANSLATOR (Extender_engraver,
 		/* doc */ "Create lyric extenders",
 		/* create */ "LyricExtender",
-		/* accept */ "extender-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/fall-engraver.cc b/lily/fall-engraver.cc
index b0751a31d5..08ca8e15e8 100644
--- a/lily/fall-engraver.cc
+++ b/lily/fall-engraver.cc
@@ -112,6 +112,5 @@ ADD_ACKNOWLEDGER (Bend_after_engraver, note_head);
 ADD_TRANSLATOR (Bend_after_engraver,
 		/* doc */ "Create fall spanners.",
 		/* create */ "BendAfter",
-		/* accept */ "bend-after-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc
index b777832fcd..2c3ad0e9e1 100644
--- a/lily/figured-bass-engraver.cc
+++ b/lily/figured-bass-engraver.cc
@@ -486,9 +486,6 @@ ADD_TRANSLATOR (Figured_bass_engraver,
 		"BassFigureContinuation "
 		"BassFigureLine "
 		,
-		/* accept */
-		"bass-figure-event "
-		"rest-event",
 
 		/* read */
 		"figuredBassAlterationDirection "
diff --git a/lily/figured-bass-position-engraver.cc b/lily/figured-bass-position-engraver.cc
index 2286fe6b52..a1b97c99cb 100644
--- a/lily/figured-bass-position-engraver.cc
+++ b/lily/figured-bass-position-engraver.cc
@@ -143,8 +143,6 @@ ADD_TRANSLATOR (Figured_bass_position_engraver,
 		/* create */
 		"BassFigureAlignmentPositioning ",
 
-		/* accept */ "",
-
 		/* read */
 		" ",
 		/* write */ "");
diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index c6a6a9b0fb..020c1f6a1c 100644
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -149,7 +149,5 @@ ADD_TRANSLATOR (Fingering_engraver,
 		"Create fingering-scripts",
 		/* create */
 		"Fingering",
-		/* accept */
-		"fingering-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 1a66f6241d..9e740964a9 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -54,6 +54,5 @@ ADD_ACKNOWLEDGER (Font_size_engraver, font);
 ADD_TRANSLATOR (Font_size_engraver,
 		/* doc */ "Puts fontSize into font-size grob property.",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "fontSize",
 		/* write */ "");
diff --git a/lily/forbid-break-engraver.cc b/lily/forbid-break-engraver.cc
index 709f5e87d1..64dedf7358 100644
--- a/lily/forbid-break-engraver.cc
+++ b/lily/forbid-break-engraver.cc
@@ -52,6 +52,5 @@ ADD_TRANSLATOR (Forbid_line_break_engraver,
 		/* doc */ "Forbid line breaks when note heads "
 		"are still playing at some point.",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "busyGrobs",
 		/* write */ "forbidBreak");
diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 6368e05a09..91dd733cb8 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -104,6 +104,5 @@ ADD_ACKNOWLEDGER (Glissando_engraver, rhythmic_head);
 ADD_TRANSLATOR (Glissando_engraver,
 		/* doc */ "Engrave a glissandi",
 		/* create */ "Glissando",
-		/* accept */ "glissando-event",
 		/* read */ "followVoice",
 		/* write */ "");
diff --git a/lily/grace-engraver.cc b/lily/grace-engraver.cc
index ee9eaf9bf4..b23b168d69 100644
--- a/lily/grace-engraver.cc
+++ b/lily/grace-engraver.cc
@@ -108,6 +108,5 @@ Grace_engraver::start_translation_timestep ()
 ADD_TRANSLATOR (Grace_engraver,
 		/* doc */ "Set font size and other properties for grace notes.",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "graceSettings",
 		/* write */ "");
diff --git a/lily/grace-spacing-engraver.cc b/lily/grace-spacing-engraver.cc
index f86b12ef22..0e1f8740c5 100644
--- a/lily/grace-spacing-engraver.cc
+++ b/lily/grace-spacing-engraver.cc
@@ -69,9 +69,6 @@ ADD_TRANSLATOR (Grace_spacing_engraver,
 
 		/* create */
 		"GraceSpacing ",
-		
-		/* accept */
-		"",
 
 		/* read */
 		"currentMusicalColumn ",
diff --git a/lily/grid-line-span-engraver.cc b/lily/grid-line-span-engraver.cc
index e4cccb3c80..8bcc8a3f6a 100644
--- a/lily/grid-line-span-engraver.cc
+++ b/lily/grid-line-span-engraver.cc
@@ -63,6 +63,5 @@ ADD_TRANSLATOR (Grid_line_span_engraver,
 		/* doc */ "This engraver makes cross-staff linelines: It catches all normal "
 		"line lines, and draws a single span-line across them.",
 		/* create */ "GridLine",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/grid-point-engraver.cc b/lily/grid-point-engraver.cc
index c3810bac29..8cd53cbe89 100644
--- a/lily/grid-point-engraver.cc
+++ b/lily/grid-point-engraver.cc
@@ -40,7 +40,6 @@ Grid_point_engraver::Grid_point_engraver ()
 ADD_TRANSLATOR (Grid_point_engraver,
 		/* doc */ "generate grid points.",
 		/* create */ "GridPoint",
-		/* accept */ "",
 		/* read */ "gridInterval",
 		/* write */ "");
 
diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc
index 6f6ee8faab..70a0e7d217 100644
--- a/lily/grob-pq-engraver.cc
+++ b/lily/grob-pq-engraver.cc
@@ -139,6 +139,5 @@ ADD_TRANSLATOR (Grob_pq_engraver,
 
 		/* doc */ "Administrate when certain grobs (eg. note heads) stop playing",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "busyGrobs",
 		/* write */ "busyGrobs");
diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 5e0e0a3b2d..e899fdb8fd 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -82,7 +82,6 @@ ADD_TRANSLATOR (Hara_kiri_engraver,
 		/* doc */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
 		"interesting items (ie. note heads, lyric syllables and normal rests) ",
 		/* create */ "VerticalAxisGroup",
-		/* accept */ "",
 		/* read */ "keepAliveInterfaces",
 		/* write */ "");
 
diff --git a/lily/horizontal-bracket-engraver.cc b/lily/horizontal-bracket-engraver.cc
index cfcd882a8e..b0909c2689 100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -35,7 +35,6 @@ ADD_ACKNOWLEDGER (Horizontal_bracket_engraver, note_column);
 ADD_TRANSLATOR (Horizontal_bracket_engraver,
 		"Create horizontal brackets over notes for musical analysis purposes.",
 		"HorizontalBracket",
-		"note-grouping-event",
 		"",
 		"");
 
diff --git a/lily/hyphen-engraver.cc b/lily/hyphen-engraver.cc
index 989c8fb32c..3a1a429102 100644
--- a/lily/hyphen-engraver.cc
+++ b/lily/hyphen-engraver.cc
@@ -150,6 +150,5 @@ ADD_TRANSLATOR (Hyphen_engraver,
 		/* doc */ "Create lyric hyphens and "
 		"distance constraints between words.",
 		/* create */ "LyricHyphen LyricSpace",
-		/* accept */ "hyphen-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/include/book.hh b/lily/include/book.hh
index 360276ed08..5bdb47359c 100644
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -17,7 +17,7 @@
 
 class Book
 {
-  DECLARE_SMOBS (Book, foo);
+  DECLARE_SMOBS (Book);
 
 public:
   string user_key_;
diff --git a/lily/include/box.hh b/lily/include/box.hh
index b6f933af9b..baa4ce0b76 100644
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -12,7 +12,7 @@
 class Box
 {
   Interval interval_a_[NO_AXES];
-  DECLARE_SIMPLE_SMOBS (Box,);
+  DECLARE_SIMPLE_SMOBS (Box);
 public:
   Interval &x () {return interval_a_[X_AXIS]; }
   Interval &y (){ return interval_a_[Y_AXIS]; }
diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index dd7045015b..5884ff128e 100644
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -56,7 +56,7 @@ public:
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def, foo);
+  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };
diff --git a/lily/include/context.hh b/lily/include/context.hh
index fd3c75b3f0..74058ad798 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -21,7 +21,7 @@ class Context
   Scheme_hash_table *properties_dict () const;
   Context (Context const &src);
 
-  DECLARE_SMOBS (Context, dummy);
+  DECLARE_SMOBS (Context);
   DECLARE_CLASSNAME(Context);
   void terminate ();
 
diff --git a/lily/include/dispatcher.hh b/lily/include/dispatcher.hh
index 8b24f03c22..a849699247 100644
--- a/lily/include/dispatcher.hh
+++ b/lily/include/dispatcher.hh
@@ -33,7 +33,7 @@ public:
   void register_as_listener (Dispatcher *dist);
   void unregister_as_listener (Dispatcher *dist);
 protected:
-  DECLARE_SMOBS (Dispatcher,);
+  DECLARE_SMOBS (Dispatcher);
 };
 
 DECLARE_UNSMOB (Dispatcher, dispatcher);
diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 377d54ef0e..b3e7841f08 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -31,7 +31,7 @@ public:
   static int compare (Duration const &, Duration const &);
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Duration,);
+  DECLARE_SIMPLE_SMOBS (Duration);
 
 private:
   /// Logarithm of the base duration.
diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 4217a6e95e..dfcd1e8003 100644
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -49,7 +49,7 @@ public:
   virtual Stencil get_ascii_char_stencil (size_t k) const;
   virtual SCM sub_fonts () const;
   virtual SCM font_file_name () const;
-  DECLARE_SMOBS (Font_metric,);
+  DECLARE_SMOBS (Font_metric);
 
 private:
   /* No copying, no implicit copy constructor.  */
diff --git a/lily/include/grob-array.hh b/lily/include/grob-array.hh
index ac4ba3e0c9..e5cee3d10d 100644
--- a/lily/include/grob-array.hh
+++ b/lily/include/grob-array.hh
@@ -18,7 +18,7 @@ class Grob_array
   vector<Grob*> grobs_;
   bool ordered_;
 
-  DECLARE_SIMPLE_SMOBS (Grob_array,);
+  DECLARE_SIMPLE_SMOBS (Grob_array);
 
   Grob_array ();
 public:
diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index eee95e9b98..2ecac8bc4f 100644
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -17,7 +17,7 @@
 class Grob
 {
 private:
-  DECLARE_SMOBS (Grob, foo);
+  DECLARE_SMOBS (Grob);
   DECLARE_CLASSNAME(Grob);
   
   void init ();
diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index b22038fbeb..ff95d83b39 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -21,7 +21,7 @@ void set_lexer ();
 
 class Lily_lexer : public Includable_lexer
 {
-  DECLARE_SMOBS (Lily_lexer,);
+  DECLARE_SMOBS (Lily_lexer);
 
 private:
   int lookup_keyword (string);
diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index c460ffcd09..4fa354d280 100644
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -22,7 +22,7 @@
 */
 class Lily_parser
 {
-  DECLARE_SMOBS (Lily_parser,);
+  DECLARE_SMOBS (Lily_parser);
   friend int yyparse (void *);
 
   vector<Input> define_spots_;
diff --git a/lily/include/listener.hh b/lily/include/listener.hh
index 562380c576..5b290f4f20 100644
--- a/lily/include/listener.hh
+++ b/lily/include/listener.hh
@@ -70,7 +70,7 @@ public:
   bool operator == (Listener const &other) const
   { return target_ == other.target_ && type_ == other.type_; }
 
-  DECLARE_SIMPLE_SMOBS (Listener,);
+  DECLARE_SIMPLE_SMOBS (Listener);
 };
 DECLARE_UNSMOB (Listener, listener);
 
diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index ac895e99eb..ec84bc7448 100644
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -18,7 +18,7 @@
 */
 class Moment
 {
-  DECLARE_SIMPLE_SMOBS (Moment,);
+  DECLARE_SIMPLE_SMOBS (Moment);
 public:
   Moment ();
   Moment (int m);
diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 4078ec655b..76ecbddce7 100644
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -54,7 +54,7 @@ protected:
   Moment start_mom_;
 
   DECLARE_CLASSNAME(Music_iterator);
-  DECLARE_SMOBS (Music_iterator, dummy);
+  DECLARE_SMOBS (Music_iterator);
   Music_iterator (Music_iterator const &);
 
 public:
diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index ba34466128..56178c80cb 100644
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -17,7 +17,7 @@
 
 class Music_output
 {
-  DECLARE_SMOBS (Music_output, foo);
+  DECLARE_SMOBS (Music_output);
   DECLARE_CLASSNAME(Music_output);
 protected:
   Music_output ();
diff --git a/lily/include/object-key-dumper.hh b/lily/include/object-key-dumper.hh
index afea455601..582199ad5b 100644
--- a/lily/include/object-key-dumper.hh
+++ b/lily/include/object-key-dumper.hh
@@ -27,7 +27,7 @@ class Object_key_dumper
 
   SCM key_serial (int);
   SCM serialize_key (Object_key const *);
-  DECLARE_SMOBS (Object_key_dumper,);
+  DECLARE_SMOBS (Object_key_dumper);
 public:
   Object_key_dumper ();
   SCM get_file_contents () const;
diff --git a/lily/include/object-key-undumper.hh b/lily/include/object-key-undumper.hh
index 42a9175ff7..f42d777461 100644
--- a/lily/include/object-key-undumper.hh
+++ b/lily/include/object-key-undumper.hh
@@ -18,7 +18,7 @@ typedef map<int, Object_key const *> Int_to_key_map;
 
 struct Object_key_undumper
 {
-  DECLARE_SMOBS (Object_key_undumper,);
+  DECLARE_SMOBS (Object_key_undumper);
   Int_to_key_map keys_;
 public:
   void parse_contents (SCM);
diff --git a/lily/include/object-key.hh b/lily/include/object-key.hh
index f61862599b..c163d4c0e9 100644
--- a/lily/include/object-key.hh
+++ b/lily/include/object-key.hh
@@ -20,7 +20,7 @@
 */
 class Object_key
 {
-  DECLARE_SMOBS (Object_key,);
+  DECLARE_SMOBS (Object_key);
 
 protected:
   Object_key ();
diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index a31dcd48fc..8670be67fb 100644
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -41,7 +41,7 @@ class Output_def
 
 public:
   VIRTUAL_COPY_CONSTRUCTOR (Output_def, Output_def);
-  DECLARE_SMOBS (Output_def, );
+  DECLARE_SMOBS (Output_def);
 
 public:
   SCM scope_;
diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 6717d4f159..16b349e025 100644
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -18,7 +18,7 @@
 
 class Paper_book
 {
-  DECLARE_SMOBS (Paper_book,);
+  DECLARE_SMOBS (Paper_book);
 
   SCM systems_;
   SCM pages_;
diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh
index 4f31eb5125..42b628f453 100644
--- a/lily/include/paper-outputter.hh
+++ b/lily/include/paper-outputter.hh
@@ -26,7 +26,7 @@ class Paper_outputter
   SCM file_;
 
 public:
-  DECLARE_SMOBS (Paper_outputter,);
+  DECLARE_SMOBS (Paper_outputter);
 
 public:
   SCM file () const;
diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index 2ebbb71a41..f50d2d531c 100644
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -19,7 +19,7 @@ struct Scale
   vector<int> step_semitones_;
   Scale ();
   Scale (Scale const&);
-  DECLARE_SMOBS(Scale,);
+  DECLARE_SMOBS (Scale);
 };
 
 
@@ -72,7 +72,7 @@ public:
   string to_string () const;
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Pitch,);
+  DECLARE_SIMPLE_SMOBS (Pitch);
 };
 
 enum
diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 0b82c4629e..40d5f5e250 100644
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -20,7 +20,7 @@
 */
 class Prob
 {
-  DECLARE_SMOBS (Prob,);
+  DECLARE_SMOBS (Prob);
   DECLARE_CLASSNAME(Prob);
 
   void init_vars ();
diff --git a/lily/include/scheme-listener.hh b/lily/include/scheme-listener.hh
index 1fbf6c2c40..1dc4c720e3 100644
--- a/lily/include/scheme-listener.hh
+++ b/lily/include/scheme-listener.hh
@@ -22,7 +22,7 @@ public:
   Scheme_listener (SCM callback);
   DECLARE_LISTENER (call);
 protected:
-  DECLARE_SMOBS (Scheme_listener,);
+  DECLARE_SMOBS (Scheme_listener);
 private:
   SCM callback_;
 };
diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index d21249db4b..cbaef193be 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -54,7 +54,7 @@ private:
   SCM hash_tab_;
   unsigned elt_count_;
 
-  DECLARE_SMOBS (Scheme_hash_table, foo);
+  DECLARE_SMOBS (Scheme_hash_table);
 };
 
 #endif /* SCM_HASH_HH */
diff --git a/lily/include/score.hh b/lily/include/score.hh
index fcc5752e52..039e1d236a 100644
--- a/lily/include/score.hh
+++ b/lily/include/score.hh
@@ -19,7 +19,7 @@
 
 class Score
 {
-  DECLARE_SMOBS (Score, foo);
+  DECLARE_SMOBS (Score);
 
   SCM music_;
   SCM input_location_;
diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 758cd65b32..c803348774 100644
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -51,7 +51,7 @@ public:
   Real force () const;
   bool fits () const;
 
-  DECLARE_SIMPLE_SMOBS (Simple_spacer,);
+  DECLARE_SIMPLE_SMOBS (Simple_spacer);
 
 private:
   Real expand_line ();
diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index dd384786ed..cfd49db34f 100644
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -27,7 +27,7 @@
   SCM smobbed_copy ().
 
   Simple smobs are created by adding the
-  DECLARE_SIMPLE_SMOBS(Classname, ) to the declaration
+  DECLARE_SIMPLE_SMOBS(Classname) to the declaration
 
   2. Complex smobs are objects that have an identity. These objects
   carry this identity in the form of a self_scm () method, which is a
@@ -58,7 +58,7 @@
   list = scm_cons (p->self_scm (), list);
   scm_gc_unprotect_object (p->self_scm ());
 
-  Complex smobs are made with DECLARE_SMOBS (Classname, ) in the class
+  Complex smobs are made with DECLARE_SMOBS (Classname) in the class
   declaration.
 
   CALLING INTERFACE
@@ -88,7 +88,7 @@
   from file "ly-smobs.icc"
 */
 
-#define DECLARE_SIMPLE_SMOBS(CL, dummy)		\
+#define DECLARE_SIMPLE_SMOBS(CL)		\
   public:					\
   SCM smobbed_copy () const;			\
   DECLARE_BASE_SMOBS (CL)
@@ -113,7 +113,7 @@
   static void init_smobs ();					\
   private:
 
-#define DECLARE_SMOBS(CL, dummy)		\
+#define DECLARE_SMOBS(CL)			\
   DECLARE_BASE_SMOBS (CL)			\
     protected:					\
   virtual ~CL ();				\
diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index 21060e3704..88120da55c 100644
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -36,7 +36,7 @@ class Source_file
   void init_port ();
   void init ();
   
-  DECLARE_SMOBS(Source_file, bla);
+  DECLARE_SMOBS (Source_file);
 public:
   Source_file (string fn);
   Source_file (string, string);
diff --git a/lily/include/spring.hh b/lily/include/spring.hh
index 2ccd5facf8..8813caff92 100644
--- a/lily/include/spring.hh
+++ b/lily/include/spring.hh
@@ -19,7 +19,7 @@ struct Spring_smob
   bool expand_only_b_;
   Real inverse_strength_;
 
-  DECLARE_SIMPLE_SMOBS (Spring_smob, dummy);
+  DECLARE_SIMPLE_SMOBS (Spring_smob);
 public:
   Spring_smob ();
 };
diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 2211b8c661..c887be149c 100644
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -55,7 +55,7 @@ class Stencil
   Box dim_;
   SCM expr_;
 
-  DECLARE_SIMPLE_SMOBS (Stencil,);
+  DECLARE_SIMPLE_SMOBS (Stencil);
 public:
   Stencil (Box, SCM s);
   Stencil ();
diff --git a/lily/include/translator-dispatch-list.hh b/lily/include/translator-dispatch-list.hh
index 38543eff11..e385dee0c0 100644
--- a/lily/include/translator-dispatch-list.hh
+++ b/lily/include/translator-dispatch-list.hh
@@ -28,7 +28,7 @@ public:
   SCM static create (SCM trans_list,
 		     SCM iface_list, Direction);
 
-  DECLARE_SIMPLE_SMOBS (Engraver_dispatch_list,);
+  DECLARE_SIMPLE_SMOBS (Engraver_dispatch_list);
 };
 
 #endif /* TRANSLATOR_DISPATCH_LIST_HH */
diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index 45a7c77030..577c1db93f 100644
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -53,7 +53,7 @@ private:
 
 public:
   VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Translator_group);
-  DECLARE_SMOBS (Translator_group, dummy);
+  DECLARE_SMOBS (Translator_group);
 
 public:
   virtual void connect_to_context (Context *c);
@@ -91,7 +91,7 @@ void precomputed_recurse_over_translators (Context *c, Translator_precompute_ind
 Translator_group *get_translator_group (SCM sym);
 
 #define foobar
-#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, accepted, read, write) foobar
+#define ADD_TRANSLATOR_GROUP(classname, desc, grobs, read, write) foobar
 
 DECLARE_UNSMOB (Translator_group, translator_group);
 
diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index cadb56f1a9..b6ec74a729 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -124,7 +124,7 @@ public:
   Global_context *get_global_context () const;
 
   TRANSLATOR_DECLARATIONS (Translator);
-  DECLARE_SMOBS (Translator, dummy);
+  DECLARE_SMOBS (Translator);
 
 protected:			// should be private.
   Context *daddy_context_;
diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index ed6b6de103..bf9e9be8d5 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -32,7 +32,7 @@
   }									\
   ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
-#define ADD_TRANSLATOR(classname, desc, grobs, accepted, read, write)	\
+#define ADD_TRANSLATOR(classname, desc, grobs, read, write)		\
   Drul_array< vector<Acknowledge_information> > classname::acknowledge_static_array_drul_;	\
   IMPLEMENT_FETCH_PRECOMPUTABLE_METHODS (classname);			\
   ADD_THIS_TRANSLATOR (classname);					\
diff --git a/lily/include/tweak-registration.hh b/lily/include/tweak-registration.hh
index 11c18ea362..a7c1ad8070 100644
--- a/lily/include/tweak-registration.hh
+++ b/lily/include/tweak-registration.hh
@@ -22,7 +22,7 @@ class Tweak_registry
   Tweak_map tweaks_;
   Object_key_undumper *undumper_;
 
-  DECLARE_SMOBS (Tweak_registry,);
+  DECLARE_SMOBS (Tweak_registry);
 
 public:
   Tweak_registry ();
diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc
index 000058d629..6a4bd93f1c 100644
--- a/lily/instrument-name-engraver.cc
+++ b/lily/instrument-name-engraver.cc
@@ -150,9 +150,6 @@ ADD_TRANSLATOR (Instrument_name_engraver,
 		/* create */
 		"InstrumentName ",
 		
-		/* accept */
-		"",
-		
 		/* read */
 		"currentCommandColumn "
 		"shortInstrumentName "
diff --git a/lily/instrument-switch-engraver.cc b/lily/instrument-switch-engraver.cc
index 67a6803a0e..fe30a0423c 100644
--- a/lily/instrument-switch-engraver.cc
+++ b/lily/instrument-switch-engraver.cc
@@ -55,8 +55,6 @@ ADD_TRANSLATOR(Instrument_switch_engraver,
 			
 	       "InstrumentSwitch ",
 
-	       "",
-
 	       "instrumentCueName",
 			
 	       "");
diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index f936283233..26b3985e4e 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -199,7 +199,6 @@ ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 ADD_TRANSLATOR (Key_engraver,
 		/* doc */ "",
 		/* create */ "KeySignature",
-		/* accept */ "key-change-event",
 		
 		/* read */
 		"createKeyOnClefChange "
diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index df98520a1a..61e3592630 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -97,5 +97,4 @@ Key_performer::listen_key_change (Stream_event *ev)
 
 ADD_TRANSLATOR (Key_performer,
 		"", "",
-		"key-change-event",
 		"", "");
diff --git a/lily/laissez-vibrer-engraver.cc b/lily/laissez-vibrer-engraver.cc
index cfc331da0c..96dd9bbdd0 100644
--- a/lily/laissez-vibrer-engraver.cc
+++ b/lily/laissez-vibrer-engraver.cc
@@ -78,7 +78,5 @@ ADD_TRANSLATOR (Laissez_vibrer_engraver,
 		/* create */
 		"LaissezVibrerTie "
 		"LaissezVibrerTieColumn",
-
-		/* accept */ "laissez-vibrer-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/ledger-line-engraver.cc b/lily/ledger-line-engraver.cc
index 55c6b4bef1..e5bd582a07 100644
--- a/lily/ledger-line-engraver.cc
+++ b/lily/ledger-line-engraver.cc
@@ -115,6 +115,5 @@ ADD_ACKNOWLEDGER (Ledger_line_engraver, staff_symbol);
 ADD_TRANSLATOR (Ledger_line_engraver,
 		"Creates the spanner to draw ledger lines, and notices objects that need ledger lines",
 		/* create */ "LedgerLineSpanner",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "")
diff --git a/lily/ligature-bracket-engraver.cc b/lily/ligature-bracket-engraver.cc
index 12aec42226..18efd8177a 100644
--- a/lily/ligature-bracket-engraver.cc
+++ b/lily/ligature-bracket-engraver.cc
@@ -81,6 +81,5 @@ ADD_ACKNOWLEDGER (Ligature_bracket_engraver, note_column);
 ADD_TRANSLATOR (Ligature_bracket_engraver,
 		/* doc */ "Handles Ligature_events by engraving Ligature brackets.",
 		/* create */ "TupletBracket",
-		/* accept */ "ligature-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 7ef5dde889..75556716ec 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -158,6 +158,5 @@ Lyric_engraver::stop_translation_timestep ()
 ADD_TRANSLATOR (Lyric_engraver,
 		/* doc */ "",
 		/* create */ "LyricText",
-		/* accept */ "lyric-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index fe0638eefc..e21b7fab35 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -63,5 +63,5 @@ Lyric_performer::listen_lyric (Stream_event *event)
   events_.push_back (event);
 }
 
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+ADD_TRANSLATOR (Lyric_performer, "", "",
 		"", "");
diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 70115d62fd..baf353aa83 100644
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -173,7 +173,6 @@ ADD_TRANSLATOR (Mark_engraver,
 		"end up on the same Y-location",
 		
 		/* create */ "RehearsalMark",
-		/* accept */ "mark-event",
 		/* read */
 		"markFormatter "
 		"rehearsalMark "
diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index 126e32ec5f..49b5195594 100644
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -111,8 +111,6 @@ ADD_TRANSLATOR (Measure_grouping_engraver,
 		"Creates MeasureGrouping to indicate beat subdivision.",
 		/* create */
 		"MeasureGrouping",
-		/* accept */
-		"",
 		/* read */
 		"beatLength "
 		"currentMusicalColumn "
diff --git a/lily/melisma-translator.cc b/lily/melisma-translator.cc
index adc873d4dc..eda732be5b 100644
--- a/lily/melisma-translator.cc
+++ b/lily/melisma-translator.cc
@@ -70,7 +70,6 @@ Melisma_translator::Melisma_translator ()
 ADD_TRANSLATOR (Melisma_translator,
 		/* doc */ "This translator collects melisma information about ties, beams, and user settings (@code{melismaBusy}, and signals it to the @code{\addlyrics} code.  ",
 		/* create */ "",
-		/* accept */ "",
 		/* read */
 		"beamMelismaBusy "
 		"melismaBusy "
diff --git a/lily/melody-engraver.cc b/lily/melody-engraver.cc
index ee0e07c9b9..01fb89e4ac 100644
--- a/lily/melody-engraver.cc
+++ b/lily/melody-engraver.cc
@@ -86,6 +86,5 @@ ADD_TRANSLATOR (Melody_engraver,
 		"Create information for context dependent typesetting decisions. ",
 		"MelodyItem",
 		"",
-		"",
 		"");
 		
diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index af2d5b0e6b..45466c10c4 100644
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -419,6 +419,5 @@ ADD_ACKNOWLEDGER (Mensural_ligature_engraver, note_head);
 ADD_TRANSLATOR (Mensural_ligature_engraver,
 		/* doc */ "Handles Mensural_ligature_events by glueing special ligature heads together.",
 		/* create */ "MensuralLigature",
-		/* accept */ "ligature-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 5e5986d2ea..9caa9cebef 100644
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -101,7 +101,6 @@ ADD_TRANSLATOR (Metronome_mark_engraver,
 		"The staves are taken from the @code{stavesFound} property, "
 		"which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
 		/* create */ "MetronomeMark",
-		/* accept */ "",
 
 		/* read */
 		"stavesFound "
diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index e03696abc4..9a7816bf0d 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -260,10 +260,6 @@ ADD_TRANSLATOR (Multi_measure_rest_engraver,
 		"MultiMeasureRestNumber "
 		"MultiMeasureRestText ",
 
-		/* accept */
-		"multi-measure-rest-event "
-		"multi-measure-text-event ",
-
 		/* read */
 		"internalBarNumber "
 		"restNumberThreshold "
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 6ddd4f6595..f965e63e53 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -348,8 +348,6 @@ ADD_TRANSLATOR (New_fingering_engraver,
 		"StringFinger "
 		"Script "
 		,
-		
-		/* accept */ "",
 		/* read */
 		
 		"fingeringOrientations "
diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc
index e15eae4fee..4493ffb7b1 100644
--- a/lily/note-head-line-engraver.cc
+++ b/lily/note-head-line-engraver.cc
@@ -103,6 +103,5 @@ ADD_TRANSLATOR (Note_head_line_engraver,
 		/* doc */ "Engrave a line between two note heads, for example a glissando.  If "
 		" followVoice is set, staff switches also generate a line.",
 		/* create */ "Glissando VoiceFollower",
-		/* accept */ "glissando-event",
 		/* read */ "followVoice",
 		/* write */ "");
diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 1c6bf4142d..6c065af4f6 100644
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -106,7 +106,5 @@ ADD_TRANSLATOR (Note_heads_engraver,
 		/* doc */ "Generate noteheads.",
 		/* create */
 		"NoteHead ",
-		/* accept */
-		"note-event",
 		/* read */ "middleCPosition",
 		/* write */ "");
diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 132bd17e29..f3c081f039 100644
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -69,6 +69,5 @@ Note_name_engraver::Note_name_engraver ()
 ADD_TRANSLATOR (Note_name_engraver,
 		/* doc */ "Print pitches as words.",
 		/* create */ "NoteName",
-		/* accept */ "note-event",
 		/* read */ "printOctaveNames",
 		/* write */ "");
diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 4aecc39606..8d9dfb44c1 100644
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -94,7 +94,6 @@ Note_performer::listen_note (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Note_performer, "", "",
-		"note-event ",
 		"", "");
 
 Note_performer::Note_performer ()
diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 9a6230ee8c..243a5aff2d 100644
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -130,6 +130,5 @@ ADD_ACKNOWLEDGER (Ottava_spanner_engraver, note_column);
 ADD_TRANSLATOR (Ottava_spanner_engraver,
 		/* doc */ "Create a text spanner when the ottavation property changes..",
 		/* create */ "OttavaBracket",
-		/* accept */ "",
 		/* read */ "ottavation",
 		/* write */ "");
diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index ca6f868732..6b450ef864 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -73,9 +73,6 @@ ADD_TRANSLATOR (Output_property_engraver,
 		/* create */
 		"",
 		
-		/* accept */
-		"apply-output-event",
-		
 		/* read */
 		"",
 		
diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc
index a00c5922ad..c67d57a750 100644
--- a/lily/page-turn-engraver.cc
+++ b/lily/page-turn-engraver.cc
@@ -329,7 +329,6 @@ ADD_ACKNOWLEDGER (Page_turn_engraver, note_head);
 ADD_TRANSLATOR (Page_turn_engraver,
                 /* doc */ "Decide where page turns are allowed to go",
                 /* create */ "",
-                /* accept */ "",
                 /* read */
 		"minimumPageTurnLength "
 		"minimumRepeatLengthForPageTurn ",
diff --git a/lily/paper-column-engraver.cc b/lily/paper-column-engraver.cc
index f061b910bd..fb0ab67c81 100644
--- a/lily/paper-column-engraver.cc
+++ b/lily/paper-column-engraver.cc
@@ -244,8 +244,6 @@ ADD_TRANSLATOR (Paper_column_engraver,
 		/* create */
 		"PaperColumn "
 		"NonMusicalPaperColumn",
-		
-		/* accept */ "break-event",
 		/* read */
                 "forbidBreak "
 		,
diff --git a/lily/parenthesis-engraver.cc b/lily/parenthesis-engraver.cc
index 2c48c2597a..54e016f4d9 100644
--- a/lily/parenthesis-engraver.cc
+++ b/lily/parenthesis-engraver.cc
@@ -70,6 +70,5 @@ ADD_TRANSLATOR (Parenthesis_engraver,
 		
 		/* create */
 		"ParenthesesItem ",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/part-combine-engraver.cc b/lily/part-combine-engraver.cc
index 284f7616c7..b862a4f73d 100644
--- a/lily/part-combine-engraver.cc
+++ b/lily/part-combine-engraver.cc
@@ -103,7 +103,6 @@ ADD_TRANSLATOR (Part_combine_engraver,
 		/* doc */ "Part combine engraver for orchestral scores:		"
 		"Print markings a2, Solo, Solo II, and unisono ",
 		/* create */ "CombineTextScript",
-		/* accept */ "part-combine-event",
 		/* read */ "printPartCombineTexts soloText soloIIText "
 		"aDueText",
 		/* write */ "");
diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index e76bbaeb08..a6c47e872c 100644
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -235,9 +235,6 @@ ADD_TRANSLATOR (Percent_repeat_engraver,
 		"DoublePercentRepeatCounter "
 		"PercentRepeat "
 		"PercentRepeatCounter ",
-		
-		/* accept */
-		"percent-event ",
 
 		/* read */
 		"countPercentRepeats "
diff --git a/lily/performer-group.cc b/lily/performer-group.cc
index d1696dac74..6eb2b656c2 100644
--- a/lily/performer-group.cc
+++ b/lily/performer-group.cc
@@ -16,7 +16,6 @@
 ADD_TRANSLATOR_GROUP (Performer_group,
 		      /* doc */ "",
 		      /* create */ "",
-		      /* accept */ "",
 		      /* read */ "",
 		      /* write */ "");
 
diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc
index 1c14503adf..c1261f3066 100644
--- a/lily/phrasing-slur-engraver.cc
+++ b/lily/phrasing-slur-engraver.cc
@@ -187,6 +187,5 @@ ADD_ACKNOWLEDGER (Phrasing_slur_engraver, tie);
 ADD_TRANSLATOR (Phrasing_slur_engraver,
 		/* doc */ "Print phrasing slurs. Similar to @ref{Slur_engraver}",
 		/* create */ "PhrasingSlur",
-		/* accept */ "phrasing-slur-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc
index c8a44bd4e4..621ad79c63 100644
--- a/lily/piano-pedal-engraver.cc
+++ b/lily/piano-pedal-engraver.cc
@@ -606,9 +606,6 @@ ADD_TRANSLATOR (Piano_pedal_engraver,
 		"UnaCordaPedal "
 		"UnaCordaPedalLineSpanner ",
 
-		/* accept */
-		"pedal-event",
-
 		/* read */
 		"currentCommandColumn "
 		"pedalSostenutoStrings "
diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index 3b51fd83ec..67d16d4019 100644
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -160,5 +160,4 @@ Piano_pedal_performer::listen_una_corda (Stream_event *r)
 }
 
 ADD_TRANSLATOR (Piano_pedal_performer, "", "",
-		"pedal-event",
 		"", "");
diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc
index 65cef28d72..50d2d862ac 100644
--- a/lily/pitch-squash-engraver.cc
+++ b/lily/pitch-squash-engraver.cc
@@ -40,6 +40,5 @@ ADD_TRANSLATOR (Pitch_squash_engraver,
 		"demonstrating the rhythm of a melody.",
 
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "squashedPosition",
 		/* write */ "");
diff --git a/lily/pitched-trill-engraver.cc b/lily/pitched-trill-engraver.cc
index 84e99f0039..da74dafcdd 100644
--- a/lily/pitched-trill-engraver.cc
+++ b/lily/pitched-trill-engraver.cc
@@ -153,8 +153,6 @@ ADD_TRANSLATOR (Pitched_trill_engraver,
 		"TrillPitchAccidental "
 		"TrillPitchGroup ",
 
-		/* accept */ "",
-
 		/* read */ "",
 
 		/* write */ "");
diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc
index 896ad6f694..5af35d291b 100644
--- a/lily/recording-group-engraver.cc
+++ b/lily/recording-group-engraver.cc
@@ -82,6 +82,5 @@ ADD_TRANSLATOR_GROUP (Recording_group_engraver,
 		      "for this context. Calls the procedure "
 		      "in @code{recordEventSequence} when finished.",
 		      "",
-		      "",
 		      "recordEventSequence",
 		      "");
diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc
index a0d94369d5..56301cd2a3 100644
--- a/lily/repeat-acknowledge-engraver.cc
+++ b/lily/repeat-acknowledge-engraver.cc
@@ -110,6 +110,5 @@ ADD_TRANSLATOR (Repeat_acknowledge_engraver,
 		/* doc */ "Acknowledge repeated music, and convert the contents of "
 		"repeatCommands ainto an appropriate setting for whichBar.",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "repeatCommands whichBar",
 		/* write */ "");
diff --git a/lily/repeat-tie-engraver.cc b/lily/repeat-tie-engraver.cc
index c793449dda..7678850d89 100644
--- a/lily/repeat-tie-engraver.cc
+++ b/lily/repeat-tie-engraver.cc
@@ -77,7 +77,5 @@ ADD_TRANSLATOR (Repeat_tie_engraver,
 		/* create */
 		"RepeatTie "
 		"RepeatTieColumn ",
-
-		/* accept */ "repeat-tie-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc
index ef2ecfb420..6158a8b4f4 100644
--- a/lily/rest-collision-engraver.cc
+++ b/lily/rest-collision-engraver.cc
@@ -68,6 +68,5 @@ ADD_ACKNOWLEDGER (Rest_collision_engraver, note_column);
 ADD_TRANSLATOR (Rest_collision_engraver,
 		/* doc */ "Handles collisions of rests.",
 		/* create */ "RestCollision",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc
index 68ec862843..ec812ec2ed 100644
--- a/lily/rest-engraver.cc
+++ b/lily/rest-engraver.cc
@@ -79,6 +79,5 @@ Rest_engraver::listen_rest (Stream_event *ev)
 ADD_TRANSLATOR (Rest_engraver,
 		/* doc */ "",
 		/* create */ "Rest ",
-		/* accept */ "rest-event",
 		/* read */ "middleCPosition",
 		/* write */ "");
diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc
index 3c250c92b2..9543fcc92f 100644
--- a/lily/rhythmic-column-engraver.cc
+++ b/lily/rhythmic-column-engraver.cc
@@ -164,6 +164,5 @@ ADD_ACKNOWLEDGER (Rhythmic_column_engraver, rhythmic_head);
 ADD_TRANSLATOR (Rhythmic_column_engraver,
 		/* doc */ "Generates NoteColumn, an objects that groups stems, noteheads and rests.",
 		/* create */ "NoteColumn NoteSpacing",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index c81c5fce6b..1f8832831f 100644
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -168,9 +168,6 @@ ADD_TRANSLATOR_GROUP (Score_engraver,
 		      "that there are no beams or notes that prevent a breakpoint.) ",
 		      /* create */
 		      "System ",
-
-		      /* accept */
-		      "",
 		      
 		      /* read */
 		      "currentMusicalColumn "
diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index 2bdfdd54b9..34c5a1c78d 100644
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -26,7 +26,6 @@
 ADD_TRANSLATOR_GROUP (Score_performer,
 		      /* doc */ "",
 		      /* create */ "",
-		      /* accept */ "",
 		      /* read */ "",
 		      /* write */ "");
 
diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc
index 7ebfc74dbd..ce69a3929c 100644
--- a/lily/script-column-engraver.cc
+++ b/lily/script-column-engraver.cc
@@ -69,6 +69,5 @@ ADD_ACKNOWLEDGER (Script_column_engraver, side_position);
 ADD_TRANSLATOR (Script_column_engraver,
 		/* doc */ "",
 		/* create */ "ScriptColumn",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index e25405b732..d1605cc8b7 100644
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -245,6 +245,5 @@ ADD_ACKNOWLEDGER (Script_engraver, stem_tremolo);
 ADD_TRANSLATOR (Script_engraver,
 		/* doc */ "Handles note scripted articulations.",
 		/* create */ "Script",
-		/* accept */ "script-event articulation-event",
 		/* read */ "scriptDefinitions",
 		/* write */ "");
diff --git a/lily/script-row-engraver.cc b/lily/script-row-engraver.cc
index 4a76c78c52..3f81f54380 100644
--- a/lily/script-row-engraver.cc
+++ b/lily/script-row-engraver.cc
@@ -74,6 +74,5 @@ ADD_ACKNOWLEDGER (Script_row_engraver, side_position);
 ADD_TRANSLATOR (Script_row_engraver,
 		/* doc */ "Determine order in horizontal side position elements. ",
 		/* create */ "ScriptRow ",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc
index 9eb889e14c..aa6f05a18f 100644
--- a/lily/separating-line-group-engraver.cc
+++ b/lily/separating-line-group-engraver.cc
@@ -221,6 +221,5 @@ ADD_TRANSLATOR (Separating_line_group_engraver,
 		"SeparationItem "
 		"SeparatingGroupSpanner "
 		"StaffSpacing",
-		/* accept */ "",
 		/* read */ "createSpacing",
 		/* write */ "breakableSeparationItem");
diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index 16d5c4ba5f..7df5c317a0 100644
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -70,6 +70,5 @@ Slash_repeat_engraver::process_music ()
 ADD_TRANSLATOR (Slash_repeat_engraver,
 		/* doc */ "Make beat repeats.",
 		/* create */ "RepeatSlash",
-		/* accept */ "percent-event",
 		/* read */ "measureLength",
 		/* write */ "");
diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 55080f092b..c203d4602d 100644
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -213,6 +213,5 @@ ADD_ACKNOWLEDGER (Slur_engraver, tuplet_number);
 ADD_TRANSLATOR (Slur_engraver,
 		/* doc */ "Build slur grobs from slur events",
 		/* create */ "Slur",
-		/* accept */ "slur-event",
 		/* read */ "slurMelismaBusy doubleSlurs",
 		/* write */ "");
diff --git a/lily/slur-performer.cc b/lily/slur-performer.cc
index 447897d8b6..6c8cd3a192 100644
--- a/lily/slur-performer.cc
+++ b/lily/slur-performer.cc
@@ -86,5 +86,4 @@ Slur_performer::listen_slur (Stream_event *ev)
 
 ADD_TRANSLATOR (Slur_performer,
 		"", "",
-		"slur-event",
 		"", "");
diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc
index 914c672ccd..56886a560c 100644
--- a/lily/spacing-engraver.cc
+++ b/lily/spacing-engraver.cc
@@ -248,8 +248,6 @@ ADD_TRANSLATOR (Spacing_engraver,
 		"bookkeeping of shortest starting and playing notes  ",
 
 		/* create */ "SpacingSpanner",
-		/* accept */
-		"spacing-section-event ",
 		/* read */
 		"currentMusicalColumn "
 		"currentCommandColumn "
diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc
index e970129048..55babfbfee 100644
--- a/lily/span-arpeggio-engraver.cc
+++ b/lily/span-arpeggio-engraver.cc
@@ -99,6 +99,5 @@ ADD_ACKNOWLEDGER (Span_arpeggio_engraver, arpeggio);
 ADD_TRANSLATOR (Span_arpeggio_engraver,
 		/* doc */ "",
 		/* create */ "Arpeggio",
-		/* accept */ "",
 		/* read */ "connectArpeggios",
 		/* write */ "");
diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index c46b3d1db0..7e28a6bc41 100644
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -79,6 +79,5 @@ ADD_TRANSLATOR (Span_bar_engraver,
 		/* doc */ "This engraver makes cross-staff barlines: It catches all normal "
 		"bar lines, and draws a single span-bar across them.",
 		/* create */ "SpanBar",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 4da025d57d..28e2ea675d 100644
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -183,5 +183,4 @@ Span_dynamic_performer::listen_crescendo (Stream_event *r)
 
 ADD_TRANSLATOR (Span_dynamic_performer,
 		"", "",
-		"crescendo-event decrescendo-event",
 		"", "");
diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc
index a7ee6d181a..af4d5e04f0 100644
--- a/lily/staff-collecting-engraver.cc
+++ b/lily/staff-collecting-engraver.cc
@@ -50,6 +50,5 @@ ADD_TRANSLATOR (Staff_collecting_engraver,
 		/* doc */ "Maintain the stavesFound variable",
 
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "stavesFound",
 		/* write */ "stavesFound");
diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index c73ab6eb81..7c982d0546 100644
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -43,7 +43,6 @@ private:
 #include "translator.icc"
 
 ADD_TRANSLATOR (Staff_performer, "", "",
-		"",
 		"", "");
 
 Staff_performer::Staff_performer ()
diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc
index 242e06e46a..fe053011fc 100644
--- a/lily/staff-symbol-engraver.cc
+++ b/lily/staff-symbol-engraver.cc
@@ -151,6 +151,5 @@ ADD_TRANSLATOR (Staff_symbol_engraver,
 		/* doc */ "Create the constellation of five (default) "
 		"staff lines.",
 		/* create */ "StaffSymbol",
-		/* accept */ "staff-span-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/stanza-number-align-engraver.cc b/lily/stanza-number-align-engraver.cc
index bf4da5f840..94e726864f 100644
--- a/lily/stanza-number-align-engraver.cc
+++ b/lily/stanza-number-align-engraver.cc
@@ -63,7 +63,6 @@ ADD_ACKNOWLEDGER (Stanza_number_align_engraver, stanza_number);
 ADD_TRANSLATOR (Stanza_number_align_engraver,
 		"This engraver ensures that stanza numbers are neatly aligned. ",
 		"",
-		"",
 		" ",
 		"");
 
diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index efbcc6d26c..43a044552f 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -75,6 +75,5 @@ ADD_ACKNOWLEDGER (Stanza_number_engraver, lyric_syllable);
 ADD_TRANSLATOR (Stanza_number_engraver,
 		/* doc */ "",
 		/* create */ "StanzaNumber",
-		/* accept */ "",
 		/* read */ "stanza",
 		/* write */ "");
diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc
index d9d278799d..93f2a67aed 100644
--- a/lily/stem-engraver.cc
+++ b/lily/stem-engraver.cc
@@ -178,9 +178,6 @@ ADD_TRANSLATOR (Stem_engraver,
 		/* create */
 		"Stem "
 		"StemTremolo ",
-		
-		/* accept */
-		"tremolo-event",
 
 		/* read */
 		"tremoloFlags "
diff --git a/lily/string-number-engraver.cc b/lily/string-number-engraver.cc
index 45cc2664d0..d4aac87bc7 100644
--- a/lily/string-number-engraver.cc
+++ b/lily/string-number-engraver.cc
@@ -41,6 +41,5 @@ ADD_TRANSLATOR (String_number_engraver,
 		" swallows them all.",
 
 		/* create */ "",
-		/* accept */ "string-number-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc
index 39052cba11..e86e004c1a 100644
--- a/lily/swallow-engraver.cc
+++ b/lily/swallow-engraver.cc
@@ -32,6 +32,5 @@ ADD_TRANSLATOR (Swallow_engraver,
 		/* doc */ "This engraver swallows everything given to it silently. The purpose of "
 		"this is to prevent spurious \"event junked\" warnings.",
 		/* create */ "",
-		/* accept */ "general-music",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc
index a2e3aa7b85..595b2a99d6 100644
--- a/lily/swallow-perf.cc
+++ b/lily/swallow-perf.cc
@@ -34,6 +34,5 @@ Swallow_performer::Swallow_performer ()
 ADD_TRANSLATOR (Swallow_performer,
 		/* doc */ "",
 		/* create */ "",
-		/* accept */ "general-music",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc
index dd2151146d..5c28a61231 100644
--- a/lily/system-start-delimiter-engraver.cc
+++ b/lily/system-start-delimiter-engraver.cc
@@ -254,7 +254,6 @@ ADD_TRANSLATOR (System_start_delimiter_engraver,
 		"SystemStartBrace "
 		"SystemStartBracket "
 		"SystemStartBar",
-		/* accept */ "",
 		/* read */
 		"systemStartDelimiter "
 		"systemStartDelimiterHierarchy "
diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index d7e3f9bd66..9758ffcb95 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -150,10 +150,6 @@ ADD_TRANSLATOR (Tab_note_heads_engraver,
 		"TabNoteHead "
 		,
 
-		/* accept */
-		"note-event "
-		"string-number-event ",
-
 		/* read */
 		"middleCPosition "
 		"stringTunings "
diff --git a/lily/tab-staff-symbol-engraver.cc b/lily/tab-staff-symbol-engraver.cc
index 538223bfe8..ccdbf8683e 100644
--- a/lily/tab-staff-symbol-engraver.cc
+++ b/lily/tab-staff-symbol-engraver.cc
@@ -38,6 +38,5 @@ ADD_TRANSLATOR (Tab_staff_symbol_engraver,
 		"stringTunings for the number of lines. "
 		,
 		/* create */ "StaffSymbol",
-		/* accept */ "staff-span-event",
 		/* read */ "stringTunings",
 		/* write */ "");
diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 23ea8fa74f..34864274c4 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -75,6 +75,5 @@ Tempo_performer::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Tempo_performer, "", "",
-		"",
 		"tempoWholesPerMinute ",
 		"");
diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc
index 2c86f50d67..1dd9947476 100644
--- a/lily/text-engraver.cc
+++ b/lily/text-engraver.cc
@@ -130,6 +130,5 @@ ADD_ACKNOWLEDGER (Text_engraver, rhythmic_head);
 ADD_TRANSLATOR (Text_engraver,
 		/* doc */ "Create text-scripts",
 		/* create */ "TextScript",
-		/* accept */ "text-script-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc
index b10832f1b3..289c44e33f 100644
--- a/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@ -139,6 +139,5 @@ ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 ADD_TRANSLATOR (Text_spanner_engraver,
 		/* doc */ "Create text spanner from an event.",
 		/* create */ "TextSpanner",
-		/* accept */ "text-span-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 1dfb42fa52..ed46d59a77 100644
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -278,7 +278,5 @@ ADD_TRANSLATOR (Tie_engraver,
 		/* create */
 		"Tie "
 		"TieColumn ",
-
-		/* accept */ "tie-event",
 		/* read */ "tieWaitForNote",
 		/* write */ "tieMelismaBusy");
diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index c22fe255ec..28d5cb4748 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -113,6 +113,5 @@ Tie_performer::stop_translation_timestep ()
 ADD_TRANSLATOR (Tie_performer,
 		/* doc */ "Generate ties between noteheads of equal pitch.",
 		/* create */ "",
-		/* accept */ "tie-event",
 		/* read */ "tieMelismaBusy",
 		/* write */ "");
diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index df4a4114c7..7ec8820aeb 100644
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -82,6 +82,5 @@ Time_signature_engraver::stop_translation_timestep ()
 ADD_TRANSLATOR (Time_signature_engraver,
 		/* doc */ "Create a TimeSignature whenever @code{timeSignatureFraction} changes",
 		/* create */ "TimeSignature",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index cef302c49c..65c0d135c7 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -70,4 +70,4 @@ Time_signature_performer::stop_translation_timestep ()
 
 #include "translator.icc"
 
-ADD_TRANSLATOR (Time_signature_performer, "", "", "", "", "");
+ADD_TRANSLATOR (Time_signature_performer, "", "", "", "");
diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index d792918171..f98ac23c2f 100644
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -133,7 +133,7 @@ ADD_TRANSLATOR (Timing_translator,
 		"@code{Staff}. "
 		"\n\nThis engraver adds the alias @code{Timing} to its containing context.",
 
-		"", "",
+		"",
 
 		"internalBarNumber "
 		"currentBarNumber "
diff --git a/lily/translator.cc b/lily/translator.cc
index 4738465198..7e1518bdc1 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -343,5 +343,4 @@ ADD_TRANSLATOR (Translator,
 		"Base class. Unused",
 		"",
 		"",
-		"",
 		"");
diff --git a/lily/trill-spanner-engraver.cc b/lily/trill-spanner-engraver.cc
index 8770ab9cef..19576e6f16 100644
--- a/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@ -144,6 +144,5 @@ ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
 ADD_TRANSLATOR (Trill_spanner_engraver,
 		/* doc */ "Create trill spanner from an event.",
 		/* create */ "TrillSpanner",
-		/* accept */ "trill-span-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 7ac0e53322..7a3cf534fd 100644
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -172,7 +172,6 @@ ADD_TRANSLATOR (Tuplet_engraver,
 		/* create */
 		"TupletBracket "
 		"TupletNumber ",
-		/* accept */ "tuplet-span-event",
 		/* read */
 		"tupletFullLength "
 		"tupletFullLengthNote ",
diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index 5fcf3981e4..81f86adea1 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -43,6 +43,5 @@ ADD_TRANSLATOR (Tweak_engraver,
 		/* doc */ "Read the @code{tweaks} property from the originating event, and set properties." ,
 		
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 2f0c0bc3ea..d69037c7b2 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -36,7 +36,6 @@ Skip_event_swallow_translator::Skip_event_swallow_translator ()
 ADD_TRANSLATOR (Skip_event_swallow_translator,
 		"Swallow \\skip.",
 		"",
-		"skip-event",
 		"",
 		"");
 
@@ -45,7 +44,6 @@ Rest_swallow_translator::Rest_swallow_translator (){}
 ADD_TRANSLATOR (Rest_swallow_translator,
 		"Swallow rest",
 		"",
-		"rest-event",
 		"",
 		"");
 
@@ -65,7 +63,6 @@ Note_swallow_translator::Note_swallow_translator ()
 ADD_TRANSLATOR (Note_swallow_translator,
 		"Swallow notes",
 		"",
-		"note-event",
 		"",
 
 		"");
diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 94fe3f293d..07278d6519 100644
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -718,6 +718,5 @@ ADD_ACKNOWLEDGER (Vaticana_ligature_engraver, note_head);
 ADD_TRANSLATOR (Vaticana_ligature_engraver,
 		/* doc */ "Handles ligatures by glueing special ligature heads together.",
 		/* create */ "VaticanaLigature DotColumn",
-		/* accept */ "ligature-event",
 		/* read */ "",
 		/* write */ "");
diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc
index 9523d3c6a8..cbd79dad9a 100644
--- a/lily/vertical-align-engraver.cc
+++ b/lily/vertical-align-engraver.cc
@@ -40,7 +40,6 @@ ADD_TRANSLATOR (Vertical_align_engraver,
 		"Catch groups (staffs, lyrics lines, etc.) and stack "
 		"them vertically.",
 		/* create */ "VerticalAlignment",
-		/* accept */ "",
 		/* read */ "alignAboveContext alignBelowContext",
 		/* write */ "");
 
diff --git a/lily/vertically-spaced-context-engraver.cc b/lily/vertically-spaced-context-engraver.cc
index d00433051e..aa29003d87 100644
--- a/lily/vertically-spaced-context-engraver.cc
+++ b/lily/vertically-spaced-context-engraver.cc
@@ -58,6 +58,5 @@ ADD_ACKNOWLEDGER (Vertically_spaced_contexts_engraver, vertically_spaceable);
 ADD_TRANSLATOR (Vertically_spaced_contexts_engraver,
 		/* doc */ "",
 		/* create */ "",
-		/* accept */ "",
 		/* read */ "verticallySpacedContexts",
 		/* write */ "verticallySpacedContexts");
diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 9439d6f6d7..db4d5e60cf 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -259,6 +259,5 @@ ADD_ACKNOWLEDGER (Volta_engraver, bar_line);
 ADD_TRANSLATOR (Volta_engraver,
 		/* doc */ "Make volta brackets.",
 		/* create */ "VoltaBracket",
-		/* accept */ "",
 		/* read */ "repeatCommands voltaSpannerDuration stavesFound",
 		/* write */ "");