Updated to preserve original in word_delimiter (bug 930614)