This reverts commit 0ff9a0959a. The modified fix breaks Java and C#, where C constant expressions get used in the generated target language code in some cases. Revert this fix for now.
0ff9a0959a