Fixing comparisons, using identifiers as class constants