Merged actions and statements. Turned namespace statements into control statements