Upgraded to Scala 2.10, and continued work on the ToC code generator.