A few more small changes to charmap.c.