I tried to apply these changes again, but there are several conflicts now and I'm afraid, that new changeset will add some errors (due to wrong conflict resolution) and/or will be reverted again, so leave it as-is.

'simplify way'  is useful tool and its usage for abovementioned lines broke nothing as I can see.