Add static where appropriate.