Couple of small logical cleanups to use !empty rather than other
checks. No functional change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196412 91177308-0d34-0410-b5e6-96231b3b80d8