Reworked music-maker.

Staff line count now always returns 5 for xylophone music-makers.