Cleanup. Support for charcodes.