veto'ed by phk.

It was my intention to make a helpful improvement along the way, but I have
no capacity at the moment for a longer process.

This reverts commit d6aef69a.
This reverts commit 9b76b9a4.
This reverts commit 8fc1b2c3.