Reworked segment maker.

Segment maker no requires explicit instrument in instrument-switching voices.