FIXUP: Added a few more macros and renamed UPDATE_CHAR.