(Minor suggestion) Compiler warnings

Lines 1187 and 1872 involve an assignment within a conditional. Some compilers complain about this. Easy fix: explicitly adding "!= 0" in each conditional appears to work equivalently and silences the warnings.