More robust matching of symbolNames. It's still kinda busted for some
templatized symbolNames.