More simplification rules