Let's do that later or we will never get this pull request merged ;-). Are there any blocking issues left?