Clean things up slightly.