C: minor tidying.