Upgrade to coding standards version 2+.