Straighten the dead char implementation, take 3.

Change-Id: I4f70f6eebe076c7d2b780d25e3a2c1d3faa2edfa
5 files changed