more work on expression simplification