Added better short-circuiting on well-defined conditions: a cond's tree should
only need to be traversed one time now.