Refactored reference resolvers back into one class.