Miscellaneous tidying up.