Add more simplifications