A little further cleanup.