Make branches/0.3 compile again for mere mortals. Should even run, since my stuff...