Do not keep isNotOrLeaf, distributeDisjunction is improved but still fla...

Your isNotAnd is a way better solution than my temporary stopgap isNotOrLeaf

but the other diffs should be useful.