More cleanup.
Improved chord def parsing.