Lots of headache resulting in a very small delta, but it almost compiles!
Switched to Scala 2.10.3, split off validation into two separate packages, managed to reduce a compilation error to something I may be able to tackle