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