Expand:  Fix token <-> variable name mapping

Remove literal token names from the expansion string array list, so the
corresponding enum tokens match, and are expanded correctly.