Revert "compiler.tree.modular-arithmetic: revert strict patch so we can investigate further."

This reverts commit ec8377e125de2aae6b9704aa154beb95053151f5.