Scala 2.10.1 compatibility

The various dirty tricks we used to get things working on Scala 2.10.0 turned out, unsurprisingly, to need a few tweaks to get things working again.

Sadly, SI-6187 appears to be insufficient for our needs. I will investigate that further to pin the blame on one party or the other. (Both of which, I suppose, are me...)

These changes appear to retain compatibility with Scala 2.10.0; this passes all tests:

```
sbt> ++2.10.0
sbt> test
```