Added support for xcomp in ADJP and for vmod in NP.