chiark / gitweb /
More rearrangements and code.