This series fixes several related bugs that caused indexing to generate adjacent and overlapping term positions, which caused messages to incorrectly match phrase queries. This obsoletes (and fixes) the known-broken tests from id:1400359552-10928-1-git-send-email-amdragon at mit.edu.