Use xapian-class: and xapian-method: more widely