Merged term.h into z.h