Small bits of tidying up.