Tokenizer::simplifyEnum: Improved handling of shadow variables