Remove overgeneralized short-circuit

[#130]