(Feel free to merge, then, since me, you and Almar have looked through the changes.)