changed some if defined to ifs given 0's and null string shouldn't be evaluated as true in those
contexts