Remove x.c dependency on term