Minor tidyups.