Change make-term to accept node instead of tag, fix term macro