Merging Fizzer's fixes for non-ASCII characters.