Added analysis of named global constants, changing to use new grammar.