Bug 860624 - keep word suffixes independent and change serialization for...

...mat to use a compact variable-length node representation