Completely agree with this. In fact, the Django community realized this years ago and created a "magic removal" branch that went on to become trunk because it was much easier to understand.