Further cleaning of the chord-playing code