but that was enough tedium for one day.  Along the way, move the few
support routines for types xid and cid into a more logical place.