The refactoring on this part is hard to follow due to diff interleaving... but it general it seems that the code is not cleaner and simpler :)

NTC