More tidy-up.