That was already existing. Un-nesting them should be done in a separate pass. There is a higher risk of introducing a bug and this first pass already introduces a large amount of changes.