Add back FoldOpIntoPhi optimizations with fix. Included test cases to help catch...