This also fixes a quadratic compilation time issue noticeable when compiling
code with a large number of "and" and "or" operators.