Clean up around lexical comparisons