For the most part, these patches take what's in conductor and make only the changes needed to get them working. I think this sort of internal refactoring should probably happen in a separate patch (to allow for continuity of the first alberich version of these files and the last conductor version) -- in any case it still may make sense to just go ahead and do this here by adding another patch to the pull request.