Fix encoding two byte overhangs.