Add an option to disable short-circuiting.