SI-6863 Check for EmptyTree rather than isEmpty

While working on another bug I realized that I should just add
EmptyTree to the set of "simple" expressions rather than having
a separate case for "isEmpty"