Add 'static' where required.