Further tidyup.