Add AttributeSet class, remove references from Expression.