[cvs-nhc98] patch applied (yhc): Move to pulling Uniplate from yhc/depends