Attr, AttrValue changes

Mostly cosmetics.