Minor tidyup.