Merge "Don't redefine B_PACK_CHARS"