Add test for additional fold opportunity.

Update style and cast.

Switch to worklist-based constant search instead of recursion. Clean up style.

fix change description