More simplifications for #302