Clean up short circuiting logic.