This significantly simplifies codegen and should improve mask perf. Co-authored-by: Jacob Lifshay <programmerjake@gmail.com>