Further work on phantomquail to make it work with the latest Quail dev branch.