Adapt code to Scala 2.10, some parser improvements