Changed tokenization for alignment to make it consistent with gold alignments.