[KFSQA-618] Moved some stuff around w.r.t. the extended attributes stuff. Should be a little more concise now.