Add static qualifiers where appropriate.