xattr: rewrite conditional selection
xattr: cleanup