Upgrade to CM4. Reformat code.