Small change to simplify UTF decoding.