- packed_to_token(command->wd1, word1);
- packed_to_token(command->wd2, word2);
- get_vocab_metadata(word1, &(command->id1), &(command->type1));
- get_vocab_metadata(word2, &(command->id2), &(command->type2));
+ get_vocab_metadata(command->raw1, &(command->id1), &(command->type1));
+ get_vocab_metadata(command->raw2, &(command->id2), &(command->type2));