Post-feb20 simplifications