Clean up of logic in Locator
Minor change to use decoded name in GenStringImpl and varargs for mkApply in TreeGen