Merge TrivialAtom and CharacterSet into a Term abstraction, prepare Term for composition