Revert "test of array to null pointer is always false"

This reverts commit 3a891d455da8e56a1e22508024fb5303fab013c9.

This was to fix a build issue with clang-3.5, however what builds using
clang-3.5 fails with gcc. Reverting until a fix that works on both
compilers can be found.