* Don't use vector arithmetic in generic arch_32 * fix comments add/subtract
In sync with upstream commit '0a6e968'.