Instead of requesting the match tokens from the tokenizer when looking for parent streets/places and address parts, hand in the saved tokens and ask if they match. This gives the tokenizer more freedom to decide how name matching should be done.
Also introduces a separate constant for the sql directory, so that it can be put separately from the rest of the data if required.
