Ticket #5297: simplifyCalculations should pass once more on tokens being simplified.
Merge pull request #303 from simartin/ticket_5297

Ticket #5297: simplifyCalculations should pass once more on simplified tokens