Patch Set 3: Looks good to me, approved; IP review completed

I approve it know because some important proposals are waiting for it and this commit should not do a semantic change. It's only a refactoring preparing the base for later commits