Further changes to please Lord Sphinx.