More work on Tox core integration.