group unsafe math folds together for easier reading

Also added a FIXME regarding redundant folds for non-canonicalized constants.