Replace global variable with string literal
Update constant lookup to use stricter approach