Merge pull request #2574 from jrioux/assumptions

Sanitize assumptions on symbols.