Merge "Straighten the dead char implementation."