Minor tidying up.