Make some tidying changes.