Some improvements in Wikitext efficiency

Improved + to reduce the number of redundant CompositeWikitexts we're
generating.  Still not right, but at least it's not quite as bad.