Make a few tidying changes.