Hum ... ok, maybe in a next commit. But I will leave it for now.