Rather than look to the second line ahead, you can look two lines back when reaching a '--'. Just a change of perspective that makes things much easier.

Just my 2 cents, -gjb-