ossia again

[David Bobroff]

My ossias are working but I've got a troubling artifact.  In the 
following snippet I get some space at the end of the first line 
following the barline.  At the end of the second line I get a 
disembodied bar line which I had not seen in the actual score I'm 
making.  I'm missing some important detail here.

-David

%%%%% START LILYPOND %%%%%

\version "2.12.3"

ossia = \relative c'' {
  \override Staff.VerticalAxisGroup #'remove-first = ##t
  \stopStaff
  s1*4
  \startStaff
  \key es \major
  \clef G
  \repeat unfold 2 {
    c'1
  }
  \stopStaff
  s1*2
  \startStaff
  c1
  c1
  \stopStaff
}



mainLine = \relative c' {
  \repeat unfold 4 {c1 }
  \break
  \repeat unfold 4 {c1 }
  \break
  \repeat unfold 4 {c1 }

}

\score {
  \relative c {
    \transpose c c {
<<
    \new Staff = ossia \with {
      \remove "Time_signature_engraver"
      fontSize = #-3
      \override StaffSymbol #'staff-space = #(magstep -3)
      \override StaffSymbol #'thickness = #(magstep -3)
    }
    \set Staff.shortInstrumentName = "Ossia"
    {
<<
        \ossia
>>
    }
    \new Staff \with {
      fontSize = #-2
      \override StaffSymbol #'staff-space = #(magstep -2)
    }
<<
      \set Staff.instrumentName = "Voice"
      \set Staff.shortInstrumentName = "Voc."
      \new Voice = "1" {
        \mainLine
      }
>>
>>
    }
  }
  \layout {
    \context {
      \RemoveEmptyStaffContext
    }
  }
}

%%%%% END LILYPOND %%%%%