Eliminated all the boolean passing in the syntax.

That was less painful than I'd feared.