Merge "Revert "Revert "More general store elimination"""