Lots more work on getting rid of tsvector stuff.