I know this should not be part of this pull request. It was just the place where I saw it and wanted to mark it as "somebody should create a follow up". ;-) I tried to do that now but either I did something wrong or Github is strange. Please have a look.