Hello,

Here's a mostly mechanical patch of Jim's that we've had in our
tree for a while.  It will be useful for followup patches, but it
still looks worth it as an independent cleanup.

Joel, is the ada bit OK?

I've tested this on x86_64-linux, and spotted no regressions.

-- 
Pedro Alves