Karl Berry wrote:
> Then there is no need for sprinkling @w throughout the source.

Something like the attached patch?  It gets rid of most @kbd instances, too.

> (It belatedly occurs to me that we should make @option, specifically,
> always disallow line breaks at hyphens.)

Yes, that sounds like a win.