Allow attributes on more tree types