Remove error code from other macros as well
Define Cipher error entries