Converted a few "x != NULL" tests to "x" for clarity.