OK, an extra commit should be able to remove all later, thanks to the scope analysis, but it has nothing to do with this one!