Some minor tidying up.