Working on the new Sire yaml format.
Cleaning some stuff up.