Use SAFE_BUF_ADDCHAR where appropriate.