I'd avoid this kind of change for changing sake only, it leads to conflicts when backporting merging stuff