A little random cleanup.