Custom: Cleaned up handling of Attr.