Keep the note length after a change of clef, etc.

Move the numeric prefix to the main loop.