Minor update for 4.0: expr and &Attribute-Name[*]