More progress on #8. Simplified component labelling for points of
interest, facilitating easier use of the full text index in finding
morphological variants.