Tidyup.
Yet another tidyup.