interchangeably, because this is fragile and doesn't work at all on the alpha. (get rid of the old hack used on the alpha, and fix RCS Ids, too.)
efa731795e