Makes sense; short-circuits added to both tests.