Harden up phrasematch/geocode benchmarks.