Clean up some more logic.