Fix function argument and "self" highlighting

It's not clear why "self" was specifically disabled, though I'm guessing
this was because it was being inconsistently recognized due to the (now
fixed) bug in the argument parser.