Andreas Rheinhardt:
> Patches attached
> 

And here is another one on top of this that gets rid of all the
deprecation warnings with Clang.

- Andreas