Ossia fragments in 2.8.2

[Shamus]

Following the instructions in the manual for getting ossia fragments
yielded the results you see in the image. The relevant bits are below.
My question is: Is there a way to make these ossia fragments stop where
they're supposed to stop, i.e., well before the repeat sign?

-- Shamus

StaffRiffs = \relative c'
{
  \set Voice.autoBeaming = ##f
  \key d \major
  \override Staff.TimeSignature #'style = #'()
  \time 3/4

  % Intro

  d'4 d e8 [ d ] |   % 1
  b4 a2 |   % 2
  d4 d e8 [ fs ] |   % 3
  d2. |   % 4
  \stopStaff

  s2.*15 |   % 5 - 19

  \startStaff
  d4 d e8 [ d ] |   % 20
  b4 a2 |   % 21
  d4 d e8 [ fs ] |   % 22
  d2. |   % 23

  d4 d e8 [ d ] |   % 24
  b4 a2 |   % 25
  d4 d e8 [ fs ] |   % 26
  fs2. |   % 27
  \stopStaff

  s2.*21 |   % 28 - 48

  \startStaff
  e4 e fs8 [ e ] |   % 49
  cs4 b2 |   % 50
  e4 e fs |   % 51
  e2.-\fermata  % 52
  \stopStaff
}

\score
{
  <<
    <<
      \new Staff = leadStaff { \new Voice = "lead" \LeadVox }
      \new Lyrics \lyricsto "lead" \LeadVoxText
      \new Lyrics \lyricsto "lead" \LeadVoxTextB
      \new Lyrics \lyricsto "lead" \LeadVoxTextC
    >>

    \new Staff \with
    {
      \remove "Time_signature_engraver"
      \remove "Clef_engraver"
%Hmm, removing this screws up the accidental formatting...
%     \remove "Key_engraver"
      fontSize = #-3.0
      \override StaffSymbol #'staff-space = #(magstep -3.0)
    }
    \StaffRiffs

    \new ChoirStaff = "Rhythm"
    <<
      \new ChordNames = "chords" \Chords
      \new RhythmicStaff = "chordRhythm" \StaffC
    >>

    \set Score.skipBars = ##t
    \set Score.melismaBusyProperties = #'()
  >>

  \layout
  {
    \context { \RemoveEmptyStaffContext }
    ragged-last = ##t
  }
}