Better token / special method detection