Revamp AFObjectModel and AFObjectProvider to use static methods and handle sets.