Tweak to make ChordEntity easier and fix flakey ChordSpec