* Restore match features, moving responsibility for them into fill_slots, so that they're computed in the kernel properly.
* Bug fix to tokenisation for nbest parse