chiark / gitweb /
Rearrangement more or less sorted, back to trying to get it to compile.