line break immediately after start of volta

[sylvius]

Hi all,

I found examples of line breaks right after the beginning of a \repeat volta 2 
in classical guitar literature (19th century).  But this doesn't seem to be 
easy to do with LilyPond.  This is what I have achieved so far:

%%%%
\version "2.18.2"
{
  \repeat unfold 8 c'1
  \repeat volta 2 {
    \stopStaff
    \grace s256 \bar " "
    \break
    \startStaff
    \repeat unfold 16 c'1
  }
}
%%%%

Does anyone know of
a) a cleaner solution?
b) a way to ged rid off the short staff lines after the "start repeat symbol" 
(and before the line break)?

Thanks for any hint!

Sylvius