Rewired rhythm-makers.

RestRhythmMaker now inherits from RhythmMaker directly.