Don't simplify mods to subtractions.
Don't simplify mods to subtractions.

The subtractions typically result in more complex expressions that are harder
to analyze. This solution isn't pretty, but I couldn't find anything better.
