Rewired rhythm-makers.

NoteRhythmMaker now inherits from RhythmMaker directly.