Be smarter about conditioning return value.