This all sounds good to me ( although I care less about this than some ). Good to compress the name churn into a short time period if possible, ie all in magic removal
One thing, with all of changes, the django.db.models thing ends up being quite deep for such a core part. Thoughts?
