Add/test a peephole to get rid of some masks in HW