Final tidy-ups.