I've been maintaining this port for a while now.
Signed-off-by: NRichard Henderson <rth@twiddle.net>