I wondered about that as well, but I tried to minimize the structural differences so that this becomes easier to review. I don't like to mix large-scale (mostly) mechanical changes and logical changes in the same commit/MP. I still hope that most of these commits can land in the "real" upstream ofono as well.