Simpler and less aggressive simplify