Fix issue #81, busted Or(Or(a, b))
Lint cleanup