Implement Mario's suggestions:
- Clean up code replace merge algorithm with a function.
- Fix for_statement setting control variable to not a constant.
- Fix for_statement checking BY expression to get correct value for optimization
branch.

Thanks Mario.

#Wed Jan 31 15:26:34 CET 2007
eclipse.preferences.version=1
indexerId=org.eclipse.cdt.core.fastIndexer