revert to alllow short-circuiting to go through parentheses

There is no strong reason for one way or the other. So, arbitrarily
choose the simpler and most consistent solution from the spec's point
of view. Fixes #19 again