More static changes.