#KJ-116 Use syntactic terms defined so far in the rest of semantics. Fixed a bug.