More compilability changes

We're still not compilable, but hey, at least there are 100 fewer
reasons why not!