Use a boost tokenizer instead of custom regex