Work on protonym scopes/factories.
Merge with Dmitry.