Boolean expression style fixes.