Scattered Refactorings

I'm doing these while I learn the codebase.
Good spot @czpython. We must reorder them after transforming them to a set. See https://github.com/divio/django-cms/blob/develop/cms/plugin_pool.py#L241 (a few lines above, the refactory-involed ones)
@bradmwalker can you take care of that?