Default to safe. Minor cleanup.