Fix a number of things which have gone somewhat out-of-date over the last
few months.
Signed-off-by: NJonathan Corbet <corbet@lwn.net>