Correctly fix ConstProp/RemoveUselessMasking
Depends on #580