Merge "Made idiom recognition more robust."