Update to the new AttributeSet encapsulation of 'addAttr'.