Clean up some scariness.