Hiding part of a glissando when clashing a clef

When a glissando crosses a G or F clef, the \whiteout function does not hide it properly.

Here are two clef-combining stencils that offer something more accurate.