Various tidying-up.