Are this changes really needed? It doesn't feel like it is simplefying stuff. What do you think?