Cleaned up AssignmentAdapter usage.