Don't tag atomic terms (such as Ids); other small changes.