Merge "Remove unreachable code paths in constant folding."