#2685: Add correction step for values miscalculated due to cyclical symbol dependencies in the grammar. Updated unit test.