chiark / gitweb /
Further rearrangement to support macro expansion.