Simplified and Generalized Masked Diffusion for Discrete Data