Hmmm, had to drop some functionality in order to support Scala 2.11. This is messy.