Better name highlighting

Now everything that  isn't matched is matched as a *function* name (so
references to them are highlighted too, not just their declarations)