The patches look fine to me. I'd wait for another day if Sylvain or Dieter have any comments, but otherwise they can be merged.

i will remove some comments and temporary debug prints before committing.