Fix variable and constructor comparisons.