Update for Thinking Sphinx v3 (still work-in-progress)