Do I see correctly that this is the only actual change, and the rest is just formatting/branch shuffling?