Optimize and fix Safe char data to rely on less protocol calls