chiark / gitweb /
cleanup patch from Adam Garside, some of it fine tuned by myself, closes: #202499