reorganize type and term expression parser defs